diff -Nru kmailtransport-16.12.3/autotests/attributetest.cpp kmailtransport-17.04.3/autotests/attributetest.cpp
--- kmailtransport-16.12.3/autotests/attributetest.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/attributetest.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,252 +0,0 @@
-/*
-    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "attributetest.h"
-
-#include <attributefactory.h>
-#include <qtest_akonadi.h>
-#include <addressattribute.h>
-
-#include <dispatchmodeattribute.h>
-#include <errorattribute.h>
-#include <sentactionattribute.h>
-#include <sentbehaviourattribute.h>
-#include <transportattribute.h>
-
-using namespace Akonadi;
-using namespace MailTransport;
-
-void AttributeTest::initTestCase()
-{
-}
-
-void AttributeTest::testRegistrar()
-{
-    // The attributes should have been registered without any effort on our part.
-    {
-        Attribute *a = AttributeFactory::createAttribute("AddressAttribute");
-        QVERIFY(dynamic_cast<AddressAttribute *>(a));
-        delete a;
-    }
-
-    {
-        Attribute *a = AttributeFactory::createAttribute("DispatchModeAttribute");
-        QVERIFY(dynamic_cast<DispatchModeAttribute *>(a));
-        delete a;
-    }
-
-    {
-        Attribute *a = AttributeFactory::createAttribute("ErrorAttribute");
-        QVERIFY(dynamic_cast<ErrorAttribute *>(a));
-        delete a;
-    }
-
-    {
-        Attribute *a = AttributeFactory::createAttribute("SentActionAttribute");
-        QVERIFY(dynamic_cast<SentActionAttribute *>(a));
-        delete a;
-    }
-
-    {
-        Attribute *a = AttributeFactory::createAttribute("SentBehaviourAttribute");
-        QVERIFY(dynamic_cast<SentBehaviourAttribute *>(a));
-        delete a;
-    }
-
-    {
-        Attribute *a = AttributeFactory::createAttribute("TransportAttribute");
-        QVERIFY(dynamic_cast<TransportAttribute *>(a));
-        delete a;
-    }
-}
-
-void AttributeTest::testSerialization()
-{
-    {
-        QString from(QStringLiteral("from@me.org"));
-        QStringList to(QStringLiteral("to1@me.org"));
-        to << QStringLiteral("to2@me.org");
-        QStringList cc(QStringLiteral("cc1@me.org"));
-        cc << QStringLiteral("cc2@me.org");
-        QStringList bcc(QStringLiteral("bcc1@me.org"));
-        bcc << QStringLiteral("bcc2@me.org");
-        AddressAttribute *a = new AddressAttribute(from, to, cc, bcc);
-        QByteArray data = a->serialized();
-        delete a;
-        a = new AddressAttribute;
-        a->deserialize(data);
-        QCOMPARE(from, a->from());
-        QCOMPARE(to, a->to());
-        QCOMPARE(cc, a->cc());
-        QCOMPARE(bcc, a->bcc());
-        delete a;
-    }
-
-    {
-        DispatchModeAttribute::DispatchMode mode = DispatchModeAttribute::Automatic;
-        QDateTime date = QDateTime::currentDateTime();
-        // The serializer does not keep track of milliseconds, so forget them.
-        qDebug() << "ms" << date.toString(QStringLiteral("z"));
-        int ms = date.toString(QStringLiteral("z")).toInt();
-        date = date.addMSecs(-ms);
-        DispatchModeAttribute *a = new DispatchModeAttribute(mode);
-        a->setSendAfter(date);
-        QByteArray data = a->serialized();
-        delete a;
-        a = new DispatchModeAttribute;
-        a->deserialize(data);
-        QCOMPARE(mode, a->dispatchMode());
-        QCOMPARE(date, a->sendAfter());
-        delete a;
-    }
-
-    {
-        QString msg(QStringLiteral("The #!@$ing thing failed!"));
-        ErrorAttribute *a = new ErrorAttribute(msg);
-        QByteArray data = a->serialized();
-        delete a;
-        a = new ErrorAttribute;
-        a->deserialize(data);
-        QCOMPARE(msg, a->message());
-        delete a;
-    }
-
-    {
-        SentActionAttribute *a = new SentActionAttribute();
-        const qlonglong id = 123456789012345ll;
-
-        a->addAction(SentActionAttribute::Action::MarkAsReplied, QVariant(id));
-        a->addAction(SentActionAttribute::Action::MarkAsForwarded, QVariant(id));
-
-        QByteArray data = a->serialized();
-        delete a;
-        a = new SentActionAttribute;
-        a->deserialize(data);
-
-        const SentActionAttribute::Action::List actions = a->actions();
-        QCOMPARE(actions.count(), 2);
-
-        QCOMPARE(SentActionAttribute::Action::MarkAsReplied, actions[0].type());
-        QCOMPARE(id, actions[0].value().toLongLong());
-
-        QCOMPARE(SentActionAttribute::Action::MarkAsForwarded, actions[1].type());
-        QCOMPARE(id, actions[1].value().toLongLong());
-        delete a;
-    }
-
-    {
-        SentBehaviourAttribute::SentBehaviour beh = SentBehaviourAttribute::MoveToCollection;
-        Collection::Id id = 123456789012345ll;
-        SentBehaviourAttribute *a = new SentBehaviourAttribute(beh, Collection(id));
-        bool sendSilently = true;
-        a->setSendSilently(sendSilently);
-        QByteArray data = a->serialized();
-        delete a;
-        a = new SentBehaviourAttribute;
-        a->deserialize(data);
-        QCOMPARE(beh, a->sentBehaviour());
-        QCOMPARE(id, a->moveToCollection().id());
-        QCOMPARE(sendSilently, a->sendSilently());
-        delete a;
-    }
-
-    //MoveToCollection + silently
-    {
-        SentBehaviourAttribute::SentBehaviour beh = SentBehaviourAttribute::MoveToCollection;
-        Collection::Id id = 123456789012345ll;
-        SentBehaviourAttribute *a = new SentBehaviourAttribute(beh, Collection(id));
-        bool sendSilently = true;
-        a->setSendSilently(sendSilently);
-        QByteArray data = a->serialized();
-        delete a;
-        a = new SentBehaviourAttribute;
-        a->deserialize(data);
-        QCOMPARE(beh, a->sentBehaviour());
-        QCOMPARE(id, a->moveToCollection().id());
-        QCOMPARE(sendSilently, a->sendSilently());
-        SentBehaviourAttribute *copy = a->clone();
-        QCOMPARE(copy->sentBehaviour(), beh);
-        QCOMPARE(copy->moveToCollection().id(), id);
-        QCOMPARE(copy->sendSilently(), sendSilently);
-        delete a;
-        delete copy;
-    }
-
-    //Delete + silently
-    {
-        SentBehaviourAttribute::SentBehaviour beh = SentBehaviourAttribute::Delete;
-        Collection::Id id = 123456789012345ll;
-        SentBehaviourAttribute *a = new SentBehaviourAttribute(beh, Collection(id));
-        bool sendSilently = true;
-        a->setSendSilently(sendSilently);
-        QByteArray data = a->serialized();
-        delete a;
-        a = new SentBehaviourAttribute;
-        a->deserialize(data);
-        QCOMPARE(beh, a->sentBehaviour());
-        //When delete we move to -1
-        QCOMPARE(a->moveToCollection().id(), -1);
-        QCOMPARE(sendSilently, a->sendSilently());
-        SentBehaviourAttribute *copy = a->clone();
-        QCOMPARE(copy->sentBehaviour(), beh);
-        //When delete we move to -1
-        QCOMPARE(copy->moveToCollection().id(), -1);
-        QCOMPARE(copy->sendSilently(), sendSilently);
-        delete a;
-        delete copy;
-    }
-
-    //MoveToDefaultSentCollection + silently
-    {
-        SentBehaviourAttribute::SentBehaviour beh = SentBehaviourAttribute::MoveToDefaultSentCollection;
-        Collection::Id id = 123456789012345ll;
-        SentBehaviourAttribute *a = new SentBehaviourAttribute(beh, Collection(id));
-        bool sendSilently = true;
-        a->setSendSilently(sendSilently);
-        QByteArray data = a->serialized();
-        delete a;
-        a = new SentBehaviourAttribute;
-        a->deserialize(data);
-        QCOMPARE(beh, a->sentBehaviour());
-        //When movetodefaultsendCollection we move to -1
-        QCOMPARE(a->moveToCollection().id(), -1);
-        QCOMPARE(sendSilently, a->sendSilently());
-        SentBehaviourAttribute *copy = a->clone();
-        QCOMPARE(copy->sentBehaviour(), beh);
-        //When movetodefaultsendCollection we move to -1
-        QCOMPARE(copy->moveToCollection().id(), -1);
-        QCOMPARE(copy->sendSilently(), sendSilently);
-        delete a;
-        delete copy;
-    }
-
-    {
-        int id = 3219;
-        TransportAttribute *a = new TransportAttribute(id);
-        QByteArray data = a->serialized();
-        delete a;
-        a = new TransportAttribute;
-        a->deserialize(data);
-        QCOMPARE(id, a->transportId());
-        delete a;
-    }
-}
-
-QTEST_AKONADIMAIN(AttributeTest)
-
diff -Nru kmailtransport-16.12.3/autotests/attributetest.h kmailtransport-17.04.3/autotests/attributetest.h
--- kmailtransport-16.12.3/autotests/attributetest.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/attributetest.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,39 +0,0 @@
-/*
-    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef ATTRIBUTETEST_H
-#define ATTRIBUTETEST_H
-
-#include <QtCore/QObject>
-
-/**
-  This is a test of the various attributes.
-*/
-class AttributeTest : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-    void initTestCase();
-    void testRegistrar();
-    void testSerialization();
-
-};
-
-#endif
diff -Nru kmailtransport-16.12.3/autotests/CMakeLists.txt kmailtransport-17.04.3/autotests/CMakeLists.txt
--- kmailtransport-16.12.3/autotests/CMakeLists.txt	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,49 +0,0 @@
-
-include(ECMMarkAsTest)
-
-find_package(Qt5Test CONFIG REQUIRED)
-
-macro(add_akonadi_isolated_test _source _path)
-  get_filename_component(_targetName ${_source} NAME_WE)
-  set(_srcList ${_source} )
-
-  add_executable(${_targetName} ${_srcList})
-  target_link_libraries(${_targetName}
-    Qt5::Test
-    KF5::AkonadiCore
-    KF5::AkonadiMime
-    KF5::MailTransport
-    KF5::Mime
-    KF5::I18n
-    KF5::ConfigGui
-    Qt5::Widgets
-  )
-
-  # based on kde4_add_unit_test
-  if (WIN32)
-    get_target_property( _loc ${_targetName} LOCATION )
-    set(_executable ${_loc}.bat)
-  else()
-    set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_targetName})
-  endif()
-  if (UNIX)
-    set(_executable ${_executable}.shell)
-  endif()
-
-  find_program(_testrunner akonaditest)
-
-  if (KDEPIMLIBS_RUN_ISOLATED_TESTS)
-    add_test( mailtransport-${_targetName} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/${_path}/config.xml ${_executable} )
-  endif()
-endmacro(add_akonadi_isolated_test)
-
-
-
-# Akonadi testrunner-based tests:
-
-add_akonadi_isolated_test( attributetest.cpp unittestenv )
-add_akonadi_isolated_test( messagequeuejobtest.cpp unittestenv )
-MESSAGE(STATUS "REACTIVATE IT")
-if (KDEPIMLIBS_RUN_KDEPIMRUNTIME_ISOLATED_TESTS)
-   add_akonadi_isolated_test( filteractiontest.cpp unittestenv_akonadi )
-endif()
diff -Nru kmailtransport-16.12.3/autotests/filteractiontest.cpp kmailtransport-17.04.3/autotests/filteractiontest.cpp
--- kmailtransport-16.12.3/autotests/filteractiontest.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/filteractiontest.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,205 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "filteractiontest.h"
-#include <collectionpathresolver_p.h>
-#include <testattribute.h>
-
-#include <attributefactory.h>
-#include <collectioncreatejob.h>
-#include <itemcreatejob.h>
-#include <itemfetchjob.h>
-#include <itemfetchscope.h>
-#include <itemmodifyjob.h>
-#include <qtest_akonadi.h>
-#include <filteractionjob_p.h>
-
-using namespace Akonadi;
-
-QTEST_AKONADIMAIN(FilterActionTest, NoGUI)
-
-static const QByteArray acceptable = "acceptable";
-static const QByteArray unacceptable = "unacceptable";
-static const QByteArray modified = "modified";
-static Collection res1;
-
-class MyFunctor : public FilterAction
-{
-    virtual Akonadi::ItemFetchScope fetchScope() const
-    {
-        ItemFetchScope scope;
-        scope.fetchAttribute<TestAttribute>();
-        return scope;
-    }
-
-    virtual bool itemAccepted(const Akonadi::Item &item) const
-    {
-        if (!item.hasAttribute<TestAttribute>()) {
-            return false;
-        }
-        return (item.attribute<TestAttribute>()->data == acceptable);
-    }
-
-    virtual Akonadi::Job *itemAction(const Akonadi::Item &item, FilterActionJob *parent) const
-    {
-        Item cp(item);
-        TestAttribute *newa = new TestAttribute;
-        newa->data = modified;
-        cp.addAttribute(newa);
-        return new ItemModifyJob(cp, parent);
-    }
-};
-
-void FilterActionTest::initTestCase()
-{
-    AttributeFactory::registerAttribute<TestAttribute>();
-
-    CollectionPathResolver *resolver = new CollectionPathResolver("res1", this);
-    QVERIFY(resolver->exec());
-    res1 = Collection(resolver->collection());
-}
-
-void FilterActionTest::testMassModifyItem()
-{
-    Collection col = createCollection("testMassModifyItem");
-
-    // Test acceptable item.
-    Item item = createItem(col, true);
-    FilterActionJob *mjob = new FilterActionJob(item, new MyFunctor, this);
-    AKVERIFYEXEC(mjob);
-    ItemFetchJob *fjob = new ItemFetchJob(item, this);
-    fjob->fetchScope().fetchAllAttributes();
-    AKVERIFYEXEC(fjob);
-    QCOMPARE(fjob->items().count(), 1);
-    item = fjob->items().first();
-    QVERIFY(item.hasAttribute<TestAttribute>());
-    TestAttribute *attr = item.attribute<TestAttribute>();
-    QCOMPARE(attr->data, modified);
-
-    // Test unacceptable item.
-    item = createItem(col, false);
-    mjob = new FilterActionJob(item, new MyFunctor, this);
-    AKVERIFYEXEC(mjob);
-    fjob = new ItemFetchJob(item, this);
-    fjob->fetchScope().fetchAllAttributes();
-    AKVERIFYEXEC(fjob);
-    QCOMPARE(fjob->items().count(), 1);
-    item = fjob->items().first();
-    QVERIFY(item.hasAttribute<TestAttribute>());
-    attr = item.attribute<TestAttribute>();
-    QCOMPARE(attr->data, unacceptable);
-}
-
-void FilterActionTest::testMassModifyItems()
-{
-    Collection col = createCollection("testMassModifyItems");
-
-    // Test a bunch of acceptable and unacceptable items.
-    Item::List acc, unacc;
-    for (int i = 0; i < 5; i++) {
-        acc.append(createItem(col, true));
-        unacc.append(createItem(col, false));
-    }
-    Item::List all = acc + unacc;
-    QCOMPARE(all.count(), 10);
-    FilterActionJob *mjob = new FilterActionJob(all, new MyFunctor, this);
-    AKVERIFYEXEC(mjob);
-    ItemFetchJob *fjob = new ItemFetchJob(col, this);
-    fjob->fetchScope().fetchAllAttributes();
-    AKVERIFYEXEC(fjob);
-    QCOMPARE(fjob->items().count(), 10);
-    foreach (const Item &item, fjob->items()) {
-        QVERIFY(item.hasAttribute<TestAttribute>());
-        const QByteArray data = item.attribute<TestAttribute>()->data;
-        if (data == unacceptable) {
-            QVERIFY(unacc.contains(item));
-            unacc.removeAll(item);
-        } else if (data == modified) {
-            QVERIFY(acc.contains(item));
-            acc.removeAll(item);
-        } else {
-            QVERIFY2(false, QByteArray(QByteArray("Got bad data \"") + data + QByteArray("\"")));
-        }
-    }
-    QCOMPARE(acc.count(), 0);
-    QCOMPARE(unacc.count(), 0);
-}
-
-void FilterActionTest::testMassModifyCollection()
-{
-    Collection col = createCollection("testMassModifyCollection");
-
-    // Test a bunch of acceptable and unacceptable items.
-    Item::List acc, unacc;
-    for (int i = 0; i < 5; i++) {
-        acc.append(createItem(col, true));
-        unacc.append(createItem(col, false));
-    }
-    FilterActionJob *mjob = new FilterActionJob(col, new MyFunctor, this);
-    qDebug() << "Executing FilterActionJob.";
-    AKVERIFYEXEC(mjob);
-    ItemFetchJob *fjob = new ItemFetchJob(col, this);
-    fjob->fetchScope().fetchAllAttributes();
-    AKVERIFYEXEC(fjob);
-    QCOMPARE(fjob->items().count(), 10);
-    foreach (const Item &item, fjob->items()) {
-        QVERIFY(item.hasAttribute<TestAttribute>());
-        const QByteArray data = item.attribute<TestAttribute>()->data;
-        if (data == unacceptable) {
-            QVERIFY(unacc.contains(item));
-            unacc.removeAll(item);
-        } else if (data == modified) {
-            QVERIFY(acc.contains(item));
-            acc.removeAll(item);
-        } else {
-            QVERIFY2(false, QByteArray(QByteArray("Got bad data \"") + data + QByteArray("\"")));
-        }
-    }
-    QCOMPARE(acc.count(), 0);
-    QCOMPARE(unacc.count(), 0);
-}
-
-Collection FilterActionTest::createCollection(const QString &name)
-{
-    Collection col;
-    col.setParentCollection(res1);
-    col.setName(name);
-    CollectionCreateJob *ccjob = new CollectionCreateJob(col, this);
-    Q_ASSERT(ccjob->exec());
-    return ccjob->collection();
-}
-
-Item FilterActionTest::createItem(const Collection &col, bool accept)
-{
-    Q_ASSERT(col.isValid());
-
-    Item item;
-    item.setMimeType("text/directory");
-    TestAttribute *attr = new TestAttribute;
-    if (accept) {
-        attr->data = acceptable;
-    } else {
-        attr->data = unacceptable;
-    }
-    item.addAttribute(attr);
-    ItemCreateJob *cjob = new ItemCreateJob(item, col, this);
-    Q_ASSERT(cjob->exec());
-    return cjob->item();
-}
-
diff -Nru kmailtransport-16.12.3/autotests/filteractiontest.h kmailtransport-17.04.3/autotests/filteractiontest.h
--- kmailtransport-16.12.3/autotests/filteractiontest.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/filteractiontest.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef FILTERACTIONTEST_H
-#define FILTERACTIONTEST_H
-
-#include <QtCore/QObject>
-#include <QtCore/QString>
-
-#include <collection.h>
-#include <item.h>
-
-class FilterActionTest : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-    void initTestCase();
-    void testMassModifyItem();
-    void testMassModifyItems();
-    void testMassModifyCollection();
-
-private:
-    Akonadi::Collection createCollection(const QString &name);
-    Akonadi::Item createItem(const Akonadi::Collection &col, bool accept);
-};
-
-#endif
diff -Nru kmailtransport-16.12.3/autotests/messagequeuejobtest.cpp kmailtransport-17.04.3/autotests/messagequeuejobtest.cpp
--- kmailtransport-16.12.3/autotests/messagequeuejobtest.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/messagequeuejobtest.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,189 +0,0 @@
-/*
-    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "messagequeuejobtest.h"
-
-#include <QStringList>
-
-#include <agentinstance.h>
-#include <agentmanager.h>
-#include <collection.h>
-#include <collectionstatistics.h>
-#include <collectionstatisticsjob.h>
-#include <control.h>
-#include <itemfetchjob.h>
-#include <itemfetchscope.h>
-#include <itemdeletejob.h>
-#include <qtest_akonadi.h>
-#include <addressattribute.h>
-#include <messageflags.h>
-#include <specialmailcollections.h>
-#include <specialmailcollectionsrequestjob.h>
-
-#include <kmime/kmime_message.h>
-
-#include <dispatchmodeattribute.h>
-#include <errorattribute.h>
-#include <messagequeuejob.h>
-#include <sentbehaviourattribute.h>
-#include <transport.h>
-#include <transportattribute.h>
-#include <transportmanager.h>
-#include <qsignalspy.h>
-
-#define SPAM_ADDRESS ( QStringList() << QStringLiteral("idanoka@gmail.com") )
-
-using namespace Akonadi;
-using namespace KMime;
-using namespace MailTransport;
-
-void MessageQueueJobTest::initTestCase()
-{
-    Control::start();
-    // HACK: Otherwise the MDA is not switched offline soon enough apparently...
-    QTest::qWait(1000);
-
-    // Switch MDA offline to avoid spam.
-    AgentInstance mda = AgentManager::self()->instance(QStringLiteral("akonadi_maildispatcher_agent"));
-    QVERIFY(mda.isValid());
-    mda.setIsOnline(false);
-
-    // check that outbox is empty
-    SpecialMailCollectionsRequestJob *rjob = new SpecialMailCollectionsRequestJob(this);
-    rjob->requestDefaultCollection(SpecialMailCollections::Outbox);
-    QSignalSpy spy(rjob, SIGNAL(result(KJob*)));
-    QVERIFY(spy.wait(10000));
-    verifyOutboxContents(0);
-}
-
-void MessageQueueJobTest::testValidMessages()
-{
-    // check transport
-    int tid = TransportManager::self()->defaultTransportId();
-    QVERIFY2(tid >= 0, "I need a default transport, but there is none.");
-
-    // send a valid message using the default transport
-    MessageQueueJob *qjob = new MessageQueueJob;
-    qjob->transportAttribute().setTransportId(tid);
-    Message::Ptr msg = Message::Ptr(new Message);
-    msg->setContent("\nThis is message #1 from the MessageQueueJobTest unit test.\n");
-    qjob->setMessage(msg);
-    qjob->addressAttribute().setTo(SPAM_ADDRESS);
-    verifyOutboxContents(0);
-    AKVERIFYEXEC(qjob);
-
-    // fetch the message and verify it
-    QTest::qWait(1000);
-    verifyOutboxContents(1);
-    ItemFetchJob *fjob = new ItemFetchJob(
-        SpecialMailCollections::self()->defaultCollection(SpecialMailCollections::Outbox));
-    fjob->fetchScope().fetchFullPayload();
-    fjob->fetchScope().fetchAllAttributes();
-    AKVERIFYEXEC(fjob);
-    QCOMPARE(fjob->items().count(), 1);
-    Item item = fjob->items().constFirst();
-    QVERIFY(!item.remoteId().isEmpty());   // stored by the resource
-    QVERIFY(item.hasPayload<Message::Ptr>());
-    AddressAttribute *addrA = item.attribute<AddressAttribute>();
-    QVERIFY(addrA);
-    QVERIFY(addrA->from().isEmpty());
-    QCOMPARE(addrA->to().count(), 1);
-    QCOMPARE(addrA->to(), SPAM_ADDRESS);
-    QCOMPARE(addrA->cc().count(), 0);
-    QCOMPARE(addrA->bcc().count(), 0);
-    DispatchModeAttribute *dA = item.attribute<DispatchModeAttribute>();
-    QVERIFY(dA);
-    QCOMPARE(dA->dispatchMode(), DispatchModeAttribute::Automatic);   // default mode
-    SentBehaviourAttribute *sA = item.attribute<SentBehaviourAttribute>();
-    QVERIFY(sA);
-    // default sent collection
-    QCOMPARE(sA->sentBehaviour(), SentBehaviourAttribute::MoveToDefaultSentCollection);
-    TransportAttribute *tA = item.attribute<TransportAttribute>();
-    QVERIFY(tA);
-    QCOMPARE(tA->transportId(), tid);
-    ErrorAttribute *eA = item.attribute<ErrorAttribute>();
-    QVERIFY(!eA);   // no error
-    QCOMPARE(item.flags().count(), 1);
-    QVERIFY(item.flags().contains(Akonadi::MessageFlags::Queued));
-
-    // delete message, for further tests
-    ItemDeleteJob *djob = new ItemDeleteJob(item);
-    AKVERIFYEXEC(djob);
-    verifyOutboxContents(0);
-
-    // TODO test with no To: but only BCC:
-
-    // TODO test due-date sending
-
-    // TODO test sending with custom sent-mail collections
-}
-
-void MessageQueueJobTest::testInvalidMessages()
-{
-    MessageQueueJob *job = 0;
-    Message::Ptr msg;
-
-    // without message
-    job = new MessageQueueJob;
-    job->transportAttribute().setTransportId(TransportManager::self()->defaultTransportId());
-    job->addressAttribute().setTo(SPAM_ADDRESS);
-    QVERIFY(!job->exec());
-
-    // without recipients
-    job = new MessageQueueJob;
-    msg = Message::Ptr(new Message);
-    msg->setContent("\nThis is a message sent from the MessageQueueJobTest unittest."
-                    " This shouldn't have been sent.\n");
-    job->setMessage(msg);
-    job->transportAttribute().setTransportId(TransportManager::self()->defaultTransportId());
-    QVERIFY(!job->exec());
-
-    // without transport
-    job = new MessageQueueJob;
-    msg = Message::Ptr(new Message);
-    msg->setContent("\nThis is a message sent from the MessageQueueJobTest unittest."
-                    " This shouldn't have been sent.\n");
-    job->setMessage(msg);
-    job->addressAttribute().setTo(SPAM_ADDRESS);
-    QVERIFY(!job->exec());
-
-    // with MoveToCollection and no sent-mail folder
-    job = new MessageQueueJob;
-    msg = Message::Ptr(new Message);
-    msg->setContent("\nThis is a message sent from the MessageQueueJobTest unittest."
-                    " This shouldn't have been sent.\n");
-    job->setMessage(msg);
-    job->addressAttribute().setTo(SPAM_ADDRESS);
-    job->sentBehaviourAttribute().setSentBehaviour(SentBehaviourAttribute::MoveToCollection);
-    QVERIFY(!job->exec());
-}
-
-void MessageQueueJobTest::verifyOutboxContents(qlonglong count)
-{
-    QVERIFY(SpecialMailCollections::self()->hasDefaultCollection(SpecialMailCollections::Outbox));
-    Collection outbox =
-        SpecialMailCollections::self()->defaultCollection(SpecialMailCollections::Outbox);
-    QVERIFY(outbox.isValid());
-    CollectionStatisticsJob *job = new CollectionStatisticsJob(outbox);
-    AKVERIFYEXEC(job);
-    QCOMPARE(job->statistics().count(), count);
-}
-
-QTEST_AKONADIMAIN(MessageQueueJobTest)
-
diff -Nru kmailtransport-16.12.3/autotests/messagequeuejobtest.h kmailtransport-17.04.3/autotests/messagequeuejobtest.h
--- kmailtransport-16.12.3/autotests/messagequeuejobtest.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/messagequeuejobtest.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,44 +0,0 @@
-/*
-    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MESSAGEQUEUEJOBTEST_H
-#define MESSAGEQUEUEJOBTEST_H
-
-#include <QtCore/QObject>
-
-/**
-  This tests the ability to queue messages (MessageQueueJob class).
-  Note that the actual sending of messages is the MDA's job, and is not tested
-  here.
- */
-class MessageQueueJobTest : public QObject
-{
-    Q_OBJECT
-
-private Q_SLOTS:
-    void initTestCase();
-    void testValidMessages();
-    void testInvalidMessages();
-
-private:
-    void verifyOutboxContents(qlonglong count);
-
-};
-
-#endif
diff -Nru kmailtransport-16.12.3/autotests/testattribute.h kmailtransport-17.04.3/autotests/testattribute.h
--- kmailtransport-16.12.3/autotests/testattribute.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/testattribute.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,51 +0,0 @@
-/*
-    Copyright (c) 2008 Volker Krause <vkrause@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef TESTATTRIBUTE_H
-#define TESTATTRIBUTE_H
-
-#include <attribute.h>
-
-/* Attribute used for testing by various unit tests. */
-class TestAttribute : public Akonadi::Attribute
-{
-public:
-    TestAttribute() {}
-    QByteArray type() const
-    {
-        return "EXTRA";
-    }
-    QByteArray serialized() const
-    {
-        return data;
-    }
-    void deserialize(const QByteArray &ba)
-    {
-        data = ba;
-    }
-    TestAttribute *clone() const
-    {
-        TestAttribute *a = new TestAttribute;
-        a->data = data;
-        return a;
-    }
-    QByteArray data;
-};
-
-#endif
diff -Nru kmailtransport-16.12.3/autotests/TODO kmailtransport-17.04.3/autotests/TODO
--- kmailtransport-16.12.3/autotests/TODO	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/TODO	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-MessageQueueJob:
-- see source
-
-Attributes:
-- add test for common mistakes such as forgetting to setDueDate
-
diff -Nru kmailtransport-16.12.3/autotests/unittestenv/config.xml kmailtransport-17.04.3/autotests/unittestenv/config.xml
--- kmailtransport-16.12.3/autotests/unittestenv/config.xml	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv/config.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-<config>
-  <kdehome>kdehome</kdehome>
-  <confighome>xdgconfig</confighome>
-  <datahome>xdglocal</datahome>
-</config>
diff -Nru kmailtransport-16.12.3/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc kmailtransport-17.04.3/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
--- kmailtransport-16.12.3/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[ProcessedDefaults]
-defaultaddressbook=done
-defaultcalendar=done
diff -Nru kmailtransport-16.12.3/autotests/unittestenv/kdehome/share/config/kwalletrc kmailtransport-17.04.3/autotests/unittestenv/kdehome/share/config/kwalletrc
--- kmailtransport-16.12.3/autotests/unittestenv/kdehome/share/config/kwalletrc	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv/kdehome/share/config/kwalletrc	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[Wallet]
-Enabled=false
diff -Nru kmailtransport-16.12.3/autotests/unittestenv/kdehome/share/config/mailtransports kmailtransport-17.04.3/autotests/unittestenv/kdehome/share/config/mailtransports
--- kmailtransport-16.12.3/autotests/unittestenv/kdehome/share/config/mailtransports	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv/kdehome/share/config/mailtransports	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-[$Version]
-update_info=mailtransports.upd:initial-kmail-migration,mailtransports.upd:initial-knode-migration
-
-[General]
-default-transport=549190884
-
-[Transport 549190884]
-auth=true
-encryption=SSL
-host=smtp.gmail.com
-id=549190884
-name=idanoka2-stored
-password=ﾾﾴﾰﾱﾾﾻﾶﾫﾺﾬﾫ
-port=465
-storepass=true
-user=idanoka2@gmail.com
-
diff -Nru kmailtransport-16.12.3/autotests/unittestenv/kdehome/share/config/qttestrc kmailtransport-17.04.3/autotests/unittestenv/kdehome/share/config/qttestrc
--- kmailtransport-16.12.3/autotests/unittestenv/kdehome/share/config/qttestrc	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv/kdehome/share/config/qttestrc	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-[Notification Messages]
-WalletMigrate=false
diff -Nru kmailtransport-16.12.3/autotests/unittestenv/xdgconfig/akonadi/akonadiserverrc kmailtransport-17.04.3/autotests/unittestenv/xdgconfig/akonadi/akonadiserverrc
--- kmailtransport-16.12.3/autotests/unittestenv/xdgconfig/akonadi/akonadiserverrc	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv/xdgconfig/akonadi/akonadiserverrc	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-[%General]
-Driver=QSQLITE
-
-[Search]
-Manager=Dummy
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/config-mysql-db.xml kmailtransport-17.04.3/autotests/unittestenv_akonadi/config-mysql-db.xml
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/config-mysql-db.xml	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/config-mysql-db.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<config>
-  <kdehome>kdehome</kdehome>
-  <confighome>xdgconfig-mysql.db</confighome>
-  <datahome>xdglocal</datahome>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-</config>
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/config-mysql-fs.xml kmailtransport-17.04.3/autotests/unittestenv_akonadi/config-mysql-fs.xml
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/config-mysql-fs.xml	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/config-mysql-fs.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<config>
-  <kdehome>kdehome</kdehome>
-  <confighome>xdgconfig-mysql.fs</confighome>
-  <datahome>xdglocal</datahome>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-</config>
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/config-postgresql-db.xml kmailtransport-17.04.3/autotests/unittestenv_akonadi/config-postgresql-db.xml
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/config-postgresql-db.xml	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/config-postgresql-db.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<config>
-  <kdehome>kdehome</kdehome>
-  <confighome>xdgconfig-postgresql.db</confighome>
-  <datahome>xdglocal</datahome>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-</config>
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/config-postgresql-fs.xml kmailtransport-17.04.3/autotests/unittestenv_akonadi/config-postgresql-fs.xml
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/config-postgresql-fs.xml	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/config-postgresql-fs.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<config>
-  <kdehome>kdehome</kdehome>
-  <confighome>xdgconfig-postgresql.fs</confighome>
-  <datahome>xdglocal</datahome>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-</config>
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/config-sqlite.xml kmailtransport-17.04.3/autotests/unittestenv_akonadi/config-sqlite.xml
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/config-sqlite.xml	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/config-sqlite.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<config>
-  <kdehome>kdehome</kdehome>
-  <confighome>xdgconfig.sqlite</confighome>
-  <datahome>xdglocal</datahome>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-</config>
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/config.xml kmailtransport-17.04.3/autotests/unittestenv_akonadi/config.xml
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/config.xml	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/config.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-<config>
-  <kdehome>kdehome</kdehome>
-  <confighome>xdgconfig</confighome>
-  <datahome>xdglocal</datahome>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <agent synchronize="true">akonadi_knut_resource</agent>
-  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
-</config>
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/kdehome/share/config/akonadi-firstrunrc kmailtransport-17.04.3/autotests/unittestenv_akonadi/kdehome/share/config/akonadi-firstrunrc
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/kdehome/share/config/akonadi-firstrunrc	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/kdehome/share/config/akonadi-firstrunrc	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[ProcessedDefaults]
-defaultaddressbook=done
-defaultcalendar=done
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_0rc kmailtransport-17.04.3/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_0rc
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_0rc	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_0rc	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-[General]
-DataFile[$e]=$KDEHOME/testdata-res1.xml
-FileWatchingEnabled=false
-
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_1rc kmailtransport-17.04.3/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_1rc
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_1rc	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_1rc	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[General]
-DataFile[$e]=$KDEHOME/testdata-res2.xml
-FileWatchingEnabled=false
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_2rc kmailtransport-17.04.3/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_2rc
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_2rc	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_2rc	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-[General]
-DataFile[$e]=$KDEHOME/testdata-res3.xml
-FileWatchingEnabled=false
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/kdehome/testdata-res1.xml kmailtransport-17.04.3/autotests/unittestenv_akonadi/kdehome/testdata-res1.xml
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/kdehome/testdata-res1.xml	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/kdehome/testdata-res1.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,78 +0,0 @@
-<knut>
- <collection rid="6" name="res1" content="inode/directory">
-  <collection rid="10" name="foo" content="inode/directory,application/octet-stream,text/directory,text/calendar,message/rfc822">
-   <collection rid="2" name="bar" content="inode/directory">
-    <collection rid="3" name="bla" content="inode/directory">
-    </collection>
-   </collection>
-   <collection rid="4" name="bla" content="inode/directory">
-   </collection>
-   <item rid="A" mimetype="application/octet-stream">
-    <payload>testmailbody</payload>
-    <attribute type="HEAD">From: &lt;test@user.tst&gt;</attribute>
-    <flag>\SEEN</flag>
-    <flag>\FLAGGED</flag>
-    <flag>\DRAFT</flag>
-   </item>
-   <item rid="B" mimetype="application/octet-stream">
-    <payload>testmailbody1</payload>
-    <attribute type="HEAD">From: &lt;test1@user.tst&gt;</attribute>
-    <flag>\FLAGGED</flag>
-    <tag>tagrid</tag>
-   </item>
-   <item rid="C" mimetype="application/octet-stream">
-    <payload>testmailbody2</payload>
-    <attribute type="HEAD">From: &lt;test2@user.tst&gt;</attribute>
-   </item>
-   <item rid="D" mimetype="application/octet-stream">
-    <payload>testmailbody3</payload>
-    <attribute type="HEAD">From: &lt;test3@user.tst&gt;</attribute>
-   </item>
-   <item rid="E" mimetype="application/octet-stream">
-    <payload>testmailbody4</payload>
-    <attribute type="HEAD">From: &lt;test4@user.tst&gt;</attribute>
-   </item>
-   <item rid="F" mimetype="application/octet-stream">
-    <payload>testmailbody5</payload>
-    <attribute type="HEAD">From: &lt;test5@user.tst&gt;</attribute>
-   </item>
-   <item rid="G" mimetype="application/octet-stream">
-    <payload>testmailbody6</payload>
-    <attribute type="HEAD">From: &lt;test6@user.tst&gt;</attribute>
-   </item>
-   <item rid="H" mimetype="application/octet-stream">
-    <payload>testmailbody7</payload>
-    <attribute type="HEAD">From: &lt;test7@user.tst&gt;</attribute>
-   </item>
-   <item rid="I" mimetype="application/octet-stream">
-    <payload>testmailbody8</payload>
-    <attribute type="HEAD">From: &lt;test8@user.tst&gt;</attribute>
-   </item>
-   <item rid="J" mimetype="application/octet-stream">
-    <payload>testmailbody9</payload>
-    <attribute type="HEAD">From: &lt;test9@user.tst&gt;</attribute>
-   </item>
-   <item rid="K" mimetype="application/octet-stream">
-    <payload>testmailbody10</payload>
-    <attribute type="HEAD">From: &lt;test10@user.tst&gt;</attribute>
-   </item>
-   <item rid="L" mimetype="application/octet-stream">
-    <payload>testmailbody11</payload>
-    <attribute type="HEAD">From: &lt;test11@user.tst&gt;</attribute>
-   </item>
-   <item rid="M" mimetype="application/octet-stream">
-    <payload>testmailbody12</payload>
-    <attribute type="HEAD">From: &lt;test12@user.tst&gt;</attribute>
-   </item>
-   <item rid="N" mimetype="application/octet-stream">
-    <payload>testmailbody13</payload>
-    <attribute type="HEAD">From: &lt;test13@user.tst&gt;</attribute>
-   </item>
-   <item rid="O" mimetype="application/octet-stream">
-    <payload>testmailbody14</payload>
-    <attribute type="HEAD">From: &lt;test14@user.tst&gt;</attribute>
-   </item>
-  </collection>
- </collection>
- <tag name="name" type="type" gid="taggid" rid="tagrid"></tag>
-</knut>
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/kdehome/testdata-res2.xml kmailtransport-17.04.3/autotests/unittestenv_akonadi/kdehome/testdata-res2.xml
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/kdehome/testdata-res2.xml	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/kdehome/testdata-res2.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-<knut>
- <collection rid="7" name="res2" content="inode/directory">
-  <collection rid="5" name="foo2" content=""/>
-  <collection rid="9" name="space folder" content=""/>
- </collection>
-</knut>
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/kdehome/testdata-res3.xml kmailtransport-17.04.3/autotests/unittestenv_akonadi/kdehome/testdata-res3.xml
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/kdehome/testdata-res3.xml	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/kdehome/testdata-res3.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-<knut>
- <collection rid="8" name="res3" content="inode/directory,application/octet-stream">
- </collection>
-</knut>
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/kdehome/testdata.xml kmailtransport-17.04.3/autotests/unittestenv_akonadi/kdehome/testdata.xml
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/kdehome/testdata.xml	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/kdehome/testdata.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,82 +0,0 @@
-<knut>
- <collection rid="6" name="res1" content="inode/directory">
-  <collection rid="10" name="foo" content="inode/directory,application/octet-stream,text/directory,text/calendar">
-   <collection rid="2" name="bar" content="inode/directory">
-    <collection rid="3" name="bla" content="inode/directory">
-    </collection>
-   </collection>
-   <collection rid="4" name="bla" content="inode/directory">
-   </collection>
-   <item rid="A" mimetype="application/octet-stream">
-    <payload>testmailbody</payload>
-    <attribute type="HEAD">From: &lt;test@user.tst&gt;</attribute>
-    <flag>\SEEN</flag>
-    <flag>\FLAGGED</flag>
-    <flag>\DRAFT</flag>
-   </item>
-   <item rid="B" mimetype="application/octet-stream">
-    <payload>testmailbody1</payload>
-    <attribute type="HEAD">From: &lt;test1@user.tst&gt;</attribute>
-    <flag>\FLAGGED</flag>
-   </item>
-   <item rid="C" mimetype="application/octet-stream">
-    <payload>testmailbody2</payload>
-    <attribute type="HEAD">From: &lt;test2@user.tst&gt;</attribute>
-   </item>
-   <item rid="D" mimetype="application/octet-stream">
-    <payload>testmailbody3</payload>
-    <attribute type="HEAD">From: &lt;test3@user.tst&gt;</attribute>
-   </item>
-   <item rid="E" mimetype="application/octet-stream">
-    <payload>testmailbody4</payload>
-    <attribute type="HEAD">From: &lt;test4@user.tst&gt;</attribute>
-   </item>
-   <item rid="F" mimetype="application/octet-stream">
-    <payload>testmailbody5</payload>
-    <attribute type="HEAD">From: &lt;test5@user.tst&gt;</attribute>
-   </item>
-   <item rid="G" mimetype="application/octet-stream">
-    <payload>testmailbody6</payload>
-    <attribute type="HEAD">From: &lt;test6@user.tst&gt;</attribute>
-   </item>
-   <item rid="H" mimetype="application/octet-stream">
-    <payload>testmailbody7</payload>
-    <attribute type="HEAD">From: &lt;test7@user.tst&gt;</attribute>
-   </item>
-   <item rid="I" mimetype="application/octet-stream">
-    <payload>testmailbody8</payload>
-    <attribute type="HEAD">From: &lt;test8@user.tst&gt;</attribute>
-   </item>
-   <item rid="J" mimetype="application/octet-stream">
-    <payload>testmailbody9</payload>
-    <attribute type="HEAD">From: &lt;test9@user.tst&gt;</attribute>
-   </item>
-   <item rid="K" mimetype="application/octet-stream">
-    <payload>testmailbody10</payload>
-    <attribute type="HEAD">From: &lt;test10@user.tst&gt;</attribute>
-   </item>
-   <item rid="L" mimetype="application/octet-stream">
-    <payload>testmailbody11</payload>
-    <attribute type="HEAD">From: &lt;test11@user.tst&gt;</attribute>
-   </item>
-   <item rid="M" mimetype="application/octet-stream">
-    <payload>testmailbody12</payload>
-    <attribute type="HEAD">From: &lt;test12@user.tst&gt;</attribute>
-   </item>
-   <item rid="N" mimetype="application/octet-stream">
-    <payload>testmailbody13</payload>
-    <attribute type="HEAD">From: &lt;test13@user.tst&gt;</attribute>
-   </item>
-   <item rid="O" mimetype="application/octet-stream">
-    <payload>testmailbody14</payload>
-    <attribute type="HEAD">From: &lt;test14@user.tst&gt;</attribute>
-   </item>
-  </collection>
- </collection>
- <collection rid="7" name="res2" content="inode/directory">
-  <collection rid="5" name="foo2" content=""/>
-  <collection rid="9" name="space folder" content=""/>
- </collection>
- <collection rid="8" name="res3" content="inode/directory,application/octet-stream">
- </collection>
-</knut>
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/xdgconfig-mysql.db/akonadi/akonadiserverrc kmailtransport-17.04.3/autotests/unittestenv_akonadi/xdgconfig-mysql.db/akonadi/akonadiserverrc
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/xdgconfig-mysql.db/akonadi/akonadiserverrc	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/xdgconfig-mysql.db/akonadi/akonadiserverrc	1970-01-01 00:00:00.000000000 +0000
@@ -1,5 +0,0 @@
-[%General]
-ExternalPayload=false
-
-[Search]
-Manager=Dummy
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/xdgconfig-mysql.fs/akonadi/akonadiserverrc kmailtransport-17.04.3/autotests/unittestenv_akonadi/xdgconfig-mysql.fs/akonadi/akonadiserverrc
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/xdgconfig-mysql.fs/akonadi/akonadiserverrc	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/xdgconfig-mysql.fs/akonadi/akonadiserverrc	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[%General]
-SizeThreshold=0
-ExternalPayload=true
-
-[Search]
-Manager=Dummy
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/xdgconfig-postgresql.db/akonadi/akonadiserverrc kmailtransport-17.04.3/autotests/unittestenv_akonadi/xdgconfig-postgresql.db/akonadi/akonadiserverrc
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/xdgconfig-postgresql.db/akonadi/akonadiserverrc	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/xdgconfig-postgresql.db/akonadi/akonadiserverrc	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-[%General]
-Driver=QPSQL
-ExternalPayload=false
-
-[Search]
-Manager=Dummy
-
-[QPSQL]
-Name=post_table
-User=user
-Password=pass
-Options=
-StartServer=false
-Host=
-Port=5432
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/xdgconfig-postgresql.fs/akonadi/akonadiserverrc kmailtransport-17.04.3/autotests/unittestenv_akonadi/xdgconfig-postgresql.fs/akonadi/akonadiserverrc
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/xdgconfig-postgresql.fs/akonadi/akonadiserverrc	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/xdgconfig-postgresql.fs/akonadi/akonadiserverrc	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-[%General]
-Driver=QPSQL
-SizeThreshold=0
-ExternalPayload=true
-
-[Search]
-Manager=Dummy
-
-[QPSQL]
-Name=post_table
-User=user
-Password=pass
-Options=
-StartServer=false
-Host=
-Port=5432
-
diff -Nru kmailtransport-16.12.3/autotests/unittestenv_akonadi/xdgconfig.sqlite/akonadi/akonadiserverrc kmailtransport-17.04.3/autotests/unittestenv_akonadi/xdgconfig.sqlite/akonadi/akonadiserverrc
--- kmailtransport-16.12.3/autotests/unittestenv_akonadi/xdgconfig.sqlite/akonadi/akonadiserverrc	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/autotests/unittestenv_akonadi/xdgconfig.sqlite/akonadi/akonadiserverrc	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-[%General]
-Driver=QSQLITE
-
-[Debug]
-Tracer=null
-
diff -Nru kmailtransport-16.12.3/CMakeLists.txt kmailtransport-17.04.3/CMakeLists.txt
--- kmailtransport-16.12.3/CMakeLists.txt	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/CMakeLists.txt	2017-07-11 00:26:21.000000000 +0000
@@ -1,41 +1,37 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.0)
+set(PIM_VERSION "5.5.3")
 
-project(MailTransport)
+project(MailTransport VERSION ${PIM_VERSION})
 
 # ECM setup
-set(KF5_VERSION "5.28.0")
+set(KF5_VERSION "5.32.0")
 find_package(ECM ${KF5_VERSION} CONFIG REQUIRED)
 set(CMAKE_MODULE_PATH ${MailTransport_SOURCE_DIR}/cmake ${ECM_MODULE_PATH})
 
 include(GenerateExportHeader)
 include(ECMGenerateHeaders)
 include(ECMGeneratePriFile)
-include(ECMPackageConfigHelpers)
+include(CMakePackageConfigHelpers)
 include(ECMSetupVersion)
 include(FeatureSummary)
 include(KDEInstallDirs)
 include(KDECMakeSettings)
 include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
 include(ECMQtDeclareLoggingCategory)
+include(ECMCoverageOption)
+
 
 add_definitions(-DTRANSLATION_DOMAIN=\"libmailtransport5\")
 
 
-set(PIM_VERSION "5.4.3")
 
 set(KMAILTRANSPORT_LIB_VERSION ${PIM_VERSION})
 
-set(KMIME_LIB_VERSION "5.4.3")
-set(AKONADI_LIB_VERSION "5.4.3")
-set(AKONADIMIME_LIB_VERSION "5.4.3")
+set(KMIME_LIB_VERSION "5.5.3")
+set(AKONADI_LIB_VERSION "5.5.3")
+set(AKONADIMIME_LIB_VERSION "5.5.3")
 set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailTransport")
 
-ecm_setup_version(${KMAILTRANSPORT_LIB_VERSION} VARIABLE_PREFIX MAILTRANSPORT
-                        VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/mailtransport_version.h"
-                        PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5MailTransportConfigVersion.cmake"
-                        SOVERSION 5
-)
-
 ########### Find packages ###########
 find_package(KF5KCMUtils ${KF5_VERSION} CONFIG REQUIRED)
 find_package(KF5ConfigWidgets ${KF5_VERSION} CONFIG REQUIRED)
@@ -56,37 +52,15 @@
                              TYPE OPTIONAL
 )
 
-ecm_configure_package_config_file(
-  "${CMAKE_CURRENT_SOURCE_DIR}/KF5MailTransportConfig.cmake.in"
-  "${CMAKE_CURRENT_BINARY_DIR}/KF5MailTransportConfig.cmake"
-  INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
-)
-
-install(FILES
-  "${CMAKE_CURRENT_BINARY_DIR}/KF5MailTransportConfig.cmake"
-  "${CMAKE_CURRENT_BINARY_DIR}/KF5MailTransportConfigVersion.cmake"
-  DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
-  COMPONENT Devel
-)
-
-install(FILES
-   ${CMAKE_CURRENT_BINARY_DIR}/mailtransport_version.h
-   DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}
-   COMPONENT Devel
-)
-
-
-install(EXPORT KF5MailTransportTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5MailTransportTargets.cmake NAMESPACE KF5::)
-
 ########### Targets ###########
 add_subdirectory(cmake)
 add_subdirectory(src)
 add_subdirectory(kioslave)
-if(BUILD_TESTING)
-    add_subdirectory(tests)
-    add_subdirectory(autotests)
-endif()
 
 install( FILES kmailtransport.renamecategories kmailtransport.categories DESTINATION ${KDE_INSTALL_CONFDIR} )
 feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
 
+ki18n_install(po)
+if (KF5DocTools_FOUND)
+ kdoctools_install(po)
+endif()
diff -Nru kmailtransport-16.12.3/debian/changelog kmailtransport-17.04.3/debian/changelog
--- kmailtransport-16.12.3/debian/changelog	2017-05-01 19:26:39.000000000 +0000
+++ kmailtransport-17.04.3/debian/changelog	2017-08-21 13:32:08.000000000 +0000
@@ -1,3 +1,23 @@
+kmailtransport (17.04.3-0ubuntu1) artful; urgency=medium
+
+  [ Rik Mills ]
+  * Add new library package libkf5mailtransportakonadi5, and add
+    development files to -dev package
+  * Bump soname with debianabimanager due to binary incompatible
+    changes: libkf5mailtransport5 -> libkf5mailtransport5abi1
+
+  [ José Manuel Santamaría Lema ]
+  * New upstream release (17.04.1)
+  * Refresh enable_debian_abi_manager.diff
+  * Install usr/share/locale/*/LC_MESSAGES/libmailtransport5.mo by
+    libkf5mailtransport-data
+  * Install translations by kio-smtp
+  * Add Breaks/Replaces against kde-l10n
+  * New upstream release (17.04.2)
+  * New upstream release (17.04.3)
+
+ -- José Manuel Santamaría Lema <panfaust@gmail.com>  Mon, 21 Aug 2017 14:32:08 +0100
+
 kmailtransport (16.12.3-0ubuntu1) artful; urgency=medium
 
   [ José Manuel Santamaría Lema ]
diff -Nru kmailtransport-16.12.3/debian/control kmailtransport-17.04.3/debian/control
--- kmailtransport-16.12.3/debian/control	2017-05-01 19:26:39.000000000 +0000
+++ kmailtransport-17.04.3/debian/control	2017-08-21 13:32:08.000000000 +0000
@@ -6,12 +6,12 @@
 Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
                extra-cmake-modules (>= 5.31.0~),
-               libkf5akonadi-dev (>= 4:16.12.3~),
-               libkf5akonadimime-dev (>= 4:16.12.3~),
+               libkf5akonadi-dev (>= 4:17.04.3~),
+               libkf5akonadimime-dev (>= 4:17.04.3~),
                libkf5configwidgets-dev (>= 5.31.0~),
                libkf5kcmutils-dev (>= 5.31.0~),
                libkf5kdelibs4support-dev (>= 5.31.0~),
-               libkf5mime-dev (>= 16.12.3~),
+               libkf5mime-dev (>= 17.04.3~),
                libkf5wallet-dev (>= 5.31.0~),
                libsasl2-dev,
                pkg-config,
@@ -26,8 +26,8 @@
 Architecture: any
 Multi-Arch: no
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: kdepimlibs-kio-plugins, kf5-kdepimlibs-kio-plugins
-Breaks: kdepimlibs-kio-plugins, kf5-kdepimlibs-kio-plugins
+Replaces: kdepimlibs-kio-plugins, kf5-kdepimlibs-kio-plugins, ${kde-l10n:all}
+Breaks: kdepimlibs-kio-plugins, kf5-kdepimlibs-kio-plugins, ${kde-l10n:all}
 Description: mail transport service library
  Mailtransport is a library that provides the following functionality:
  .
@@ -41,9 +41,10 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: foreign
-Depends: libkf5akonadimime-dev (>= 4:16.12.3~),
-         libkf5mailtransport5 (= ${binary:Version}),
-         libkf5mime-dev (>= 16.12.3~),
+Depends: libkf5akonadimime-dev (>= 4:17.04.3~),
+         libkf5mailtransport5abi1 (= ${binary:Version}),
+         libkf5mailtransportakonadi5 (= ${binary:Version}),
+         libkf5mime-dev (>= 17.04.3~),
          libkf5wallet-dev (>= 5.31.0~),
          libsasl2-dev,
          ${misc:Depends}
@@ -60,8 +61,8 @@
 Architecture: all
 Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: libkf5mailtransport5 (<< 15.07.90+git20150819.1000)
-Replaces: libkf5mailtransport5 (<< 15.07.90+git20150819.1000)
+Breaks: libkf5mailtransport5 (<< 15.07.90+git20150819.1000), ${kde-l10n:all}
+Replaces: libkf5mailtransport5 (<< 15.07.90+git20150819.1000), ${kde-l10n:all}
 Description: mail transport service library - data files
  Mailtransport is a library that provides the following functionality:
  .
@@ -92,7 +93,9 @@
  This package also contains a KDE control module which can be embedded
  into your application to provide mail transport configuration.
 
-Package: libkf5mailtransport5
+Package: libkf5mailtransport5abi1
+X-Debian-ABI: 1
+X-CMake-Target: KF5MailTransport
 Architecture: any
 Multi-Arch: same
 Depends: libkf5mailtransport-data (= ${source:Version}),
@@ -108,3 +111,22 @@
  .
  This package also contains a KDE control module which can be embedded
  into your application to provide mail transport configuration.
+
+Package: libkf5mailtransportakonadi5
+Architecture: any
+Multi-Arch: same
+Depends: libkf5mailtransport-data (= ${source:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: kde-config-mailtransport
+Description: mail transport service library for akonadi
+ Mailtransport is a library that provides the following functionality:
+ .
+  * Shared mail transport settings.
+  * GUI elements to configure mail transport settings.
+  * Job classes for mail sending.
+ .
+ This library integrates with Akonadi.
+ .
+ This package also contains a KDE control module which can be embedded
+ into your application to provide mail transport configuration.
diff -Nru kmailtransport-16.12.3/debian/kio-smtp.install kmailtransport-17.04.3/debian/kio-smtp.install
--- kmailtransport-16.12.3/debian/kio-smtp.install	2017-05-01 19:26:39.000000000 +0000
+++ kmailtransport-17.04.3/debian/kio-smtp.install	2017-08-21 13:32:08.000000000 +0000
@@ -1,7 +1,7 @@
 etc/xdg/kmailtransport.categories
 etc/xdg/kmailtransport.renamecategories
 usr/lib/*/qt5/plugins/kf5/kio/smtp.so
-usr/share/doc/HTML/en/kioslave5/smtp/index.cache.bz2
-usr/share/doc/HTML/en/kioslave5/smtp/index.docbook
+usr/share/doc/HTML/*/kioslave5/smtp/*
 usr/share/kservices5/smtp.protocol
 usr/share/kservices5/smtps.protocol
+usr/share/locale/*/LC_MESSAGES/kio_smtp.mo
diff -Nru kmailtransport-16.12.3/debian/libkf5mailtransport5abi1.install kmailtransport-17.04.3/debian/libkf5mailtransport5abi1.install
--- kmailtransport-16.12.3/debian/libkf5mailtransport5abi1.install	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/debian/libkf5mailtransport5abi1.install	2017-08-21 13:32:08.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libKF5MailTransport.so.5abi1
+usr/lib/*/libKF5MailTransport.so.5.*
diff -Nru kmailtransport-16.12.3/debian/libkf5mailtransport5abi1.symbols kmailtransport-17.04.3/debian/libkf5mailtransport5abi1.symbols
--- kmailtransport-16.12.3/debian/libkf5mailtransport5abi1.symbols	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/debian/libkf5mailtransport5abi1.symbols	2017-08-21 13:32:08.000000000 +0000
@@ -0,0 +1,218 @@
+# SymbolsHelper-Confirmed: 16.12.3+git20170331 amd64
+libKF5MailTransport.so.5abi1 libkf5mailtransport5abi1 #MINVER#
+ ABI_5_1@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport10ServerTest11qt_metacallEN11QMetaObject4CallEiPPv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport10ServerTest11qt_metacastEPKc@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport10ServerTest11setProtocolERK7QString@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport10ServerTest14setProgressBarEP12QProgressBar@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport10ServerTest15setFakeHostnameERK7QString@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport10ServerTest16staticMetaObjectE@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport10ServerTest5startEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport10ServerTest7setPortENS_13TransportBase14EnumEncryption4typeEj@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport10ServerTest8finishedERK7QVectorIiE@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport10ServerTest9setServerERK7QString@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport10ServerTestC1EP7QObject@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport10ServerTestC2EP7QObject@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport10ServerTestD0Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport10ServerTestD1Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport10ServerTestD2Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport12TransportJob11qt_metacallEN11QMetaObject4CallEiPPv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport12TransportJob11qt_metacastEPKc@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport12TransportJob16staticMetaObjectE@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport12TransportJob5setCcERK11QStringList@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport12TransportJob5setToERK11QStringList@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport12TransportJob5startEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport12TransportJob6bufferEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport12TransportJob6setBccERK11QStringList@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport12TransportJob7setDataERK10QByteArray@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport12TransportJob9setSenderERK7QString@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport12TransportJobC1EPNS_9TransportEP7QObject@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport12TransportJobC2EPNS_9TransportEP7QObject@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport12TransportJobD0Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport12TransportJobD1Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport12TransportJobD2Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13PrecommandJob11qt_metacallEN11QMetaObject4CallEiPPv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13PrecommandJob11qt_metacastEPKc@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13PrecommandJob16staticMetaObjectE@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13PrecommandJob5startEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13PrecommandJob6doKillEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13PrecommandJobC1ERK7QStringP7QObject@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13PrecommandJobC2ERK7QStringP7QObject@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13PrecommandJobD0Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13PrecommandJobD1Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13PrecommandJobD2Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13TransportBaseC1ERK7QString@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13TransportBaseC2ERK7QString@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13TransportBaseD0Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13TransportBaseD1Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13TransportBaseD2Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13TransportTypeC1ERKS0_@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13TransportTypeC1Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13TransportTypeC2ERKS0_@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13TransportTypeC2Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13TransportTypeD1Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13TransportTypeD2Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport13TransportTypeaSERKS0_@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager11qt_metacallEN11QMetaObject4CallEiPPv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager11qt_metacastEPKc@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager12addTransportEPNS_9TransportE@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager13loadPasswordsEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager15removeTransportEi@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager16changesCommittedEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager16passwordsChangedEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager16staticMetaObjectE@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager16transportRemovedEiRK7QString@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager16transportRenamedEiRK7QStringS3_@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager17transportsChangedEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager18configureTransportEPNS_9TransportEP7QWidget@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager18createTransportJobERK7QString@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager18createTransportJobEi@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager18loadPasswordsAsyncEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager19setDefaultTransportEi@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager20emitChangesCommittedEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager22createDefaultTransportEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager27showTransportCreationDialogEP7QWidgetNS0_13ShowConditionE@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager4selfEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager6walletEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManager8scheduleEPNS_12TransportJobE@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManagerC1Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManagerC2Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManagerD0Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManagerD1Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport16TransportManagerD2Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport17TransportComboBox11qt_metacallEN11QMetaObject4CallEiPPv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport17TransportComboBox11qt_metacastEPKc@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport17TransportComboBox16setTransportListERK7QVectorIiE@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport17TransportComboBox16staticMetaObjectE@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport17TransportComboBox18updateComboboxListEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport17TransportComboBox19setCurrentTransportEi@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport17TransportComboBoxC1EP7QWidget@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport17TransportComboBoxC2EP7QWidget@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport17TransportComboBoxD0Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport17TransportComboBoxD1Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport17TransportComboBoxD2Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport25TransportManagementWidget11qt_metacallEN11QMetaObject4CallEiPPv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport25TransportManagementWidget11qt_metacastEPKc@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport25TransportManagementWidget16staticMetaObjectE@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport25TransportManagementWidgetC1EP7QWidget@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport25TransportManagementWidgetC2EP7QWidget@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport25TransportManagementWidgetD0Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport25TransportManagementWidgetD1Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport25TransportManagementWidgetD2Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport7SmtpJob10slaveErrorEPN3KIO5SlaveEiRK7QString@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport7SmtpJob10slotResultEP4KJob@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport7SmtpJob11dataRequestEPN3KIO3JobER10QByteArray@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport7SmtpJob11qt_metacallEN11QMetaObject4CallEiPPv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport7SmtpJob11qt_metacastEPKc@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport7SmtpJob12startSmtpJobEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport7SmtpJob16staticMetaObjectE@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport7SmtpJob6doKillEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport7SmtpJob7doStartEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport7SmtpJobC1EPNS_9TransportEP7QObject@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport7SmtpJobC2EPNS_9TransportEP7QObject@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport7SmtpJobD0Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport7SmtpJobD1Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport7SmtpJobD2Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9Transport11qt_metacallEN11QMetaObject4CallEiPPv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9Transport11qt_metacastEPKc@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9Transport11setPasswordERK7QString@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9Transport12readPasswordEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9Transport15forceUniqueNameEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9Transport15migrateToWalletEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9Transport16setTransportTypeERKNS_13TransportTypeE@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9Transport16staticMetaObjectE@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9Transport19updatePasswordStateEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9Transport24authenticationTypeStringEi@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9Transport7usrReadEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9Transport7usrSaveEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9Transport8passwordEv@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9TransportC1ERK7QString@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9TransportC2ERK7QString@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9TransportD0Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9TransportD1Ev@ABI_5_1 16.12.3+git20170331
+ _ZN13MailTransport9TransportD2Ev@ABI_5_1 16.12.3+git20170331
+ (optional=templinst)_ZNK12KConfigGroup9readEntryI5QSizeEET_PKcRKS2_@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport10ServerTest10metaObjectEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport10ServerTest11progressBarEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport10ServerTest12capabilitiesEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport10ServerTest12fakeHostnameEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport10ServerTest12tlsProtocolsEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport10ServerTest15normalProtocolsEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport10ServerTest15secureProtocolsEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport10ServerTest16isNormalPossibleEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport10ServerTest16isSecurePossibleEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport10ServerTest4portENS_13TransportBase14EnumEncryption4typeE@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport10ServerTest6serverEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport10ServerTest8protocolEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport12TransportJob10metaObjectEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport12TransportJob2ccEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport12TransportJob2toEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport12TransportJob3bccEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport12TransportJob4dataEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport12TransportJob6senderEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport12TransportJob9transportEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport13PrecommandJob10metaObjectEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport13TransportType11descriptionEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport13TransportType4nameEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport13TransportType4typeEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport13TransportType7isValidEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport13TransportTypeeqERKS0_@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport16TransportManager10metaObjectEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport16TransportManager10transportsEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport16TransportManager12transportIdsEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport16TransportManager13transportByIdEib@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport16TransportManager14transportNamesEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport16TransportManager15createTransportEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport16TransportManager15transportByNameERK7QStringb@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport16TransportManager18defaultTransportIdEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport16TransportManager20defaultTransportNameEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport16TransportManager5typesEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport16TransportManager7isEmptyEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport17TransportComboBox10metaObjectEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport17TransportComboBox13transportTypeEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport17TransportComboBox18currentTransportIdEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport25TransportManagementWidget10metaObjectEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport7SmtpJob10metaObjectEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport9Transport10isCompleteEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport9Transport10metaObjectEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport9Transport13transportTypeEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport9Transport20needsWalletMigrationEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport9Transport24authenticationTypeStringEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport9Transport5cloneEv@ABI_5_1 16.12.3+git20170331
+ _ZNK13MailTransport9Transport7isValidEv@ABI_5_1 16.12.3+git20170331
+ _ZTIN13MailTransport10ServerTestE@ABI_5_1 16.12.3+git20170331
+ _ZTIN13MailTransport12TransportJobE@ABI_5_1 16.12.3+git20170331
+ _ZTIN13MailTransport13PrecommandJobE@ABI_5_1 16.12.3+git20170331
+ _ZTIN13MailTransport13TransportBaseE@ABI_5_1 16.12.3+git20170331
+ _ZTIN13MailTransport16TransportManagerE@ABI_5_1 16.12.3+git20170331
+ _ZTIN13MailTransport17TransportComboBoxE@ABI_5_1 16.12.3+git20170331
+ _ZTIN13MailTransport25TransportManagementWidgetE@ABI_5_1 16.12.3+git20170331
+ _ZTIN13MailTransport7SmtpJobE@ABI_5_1 16.12.3+git20170331
+ _ZTIN13MailTransport9TransportE@ABI_5_1 16.12.3+git20170331
+ _ZTSN13MailTransport10ServerTestE@ABI_5_1 16.12.3+git20170331
+ _ZTSN13MailTransport12TransportJobE@ABI_5_1 16.12.3+git20170331
+ _ZTSN13MailTransport13PrecommandJobE@ABI_5_1 16.12.3+git20170331
+ _ZTSN13MailTransport13TransportBaseE@ABI_5_1 16.12.3+git20170331
+ _ZTSN13MailTransport16TransportManagerE@ABI_5_1 16.12.3+git20170331
+ _ZTSN13MailTransport17TransportComboBoxE@ABI_5_1 16.12.3+git20170331
+ _ZTSN13MailTransport25TransportManagementWidgetE@ABI_5_1 16.12.3+git20170331
+ _ZTSN13MailTransport7SmtpJobE@ABI_5_1 16.12.3+git20170331
+ _ZTSN13MailTransport9TransportE@ABI_5_1 16.12.3+git20170331
+ _ZTVN13MailTransport10ServerTestE@ABI_5_1 16.12.3+git20170331
+ _ZTVN13MailTransport12TransportJobE@ABI_5_1 16.12.3+git20170331
+ _ZTVN13MailTransport13PrecommandJobE@ABI_5_1 16.12.3+git20170331
+ _ZTVN13MailTransport13TransportBaseE@ABI_5_1 16.12.3+git20170331
+ _ZTVN13MailTransport16TransportManagerE@ABI_5_1 16.12.3+git20170331
+ _ZTVN13MailTransport17TransportComboBoxE@ABI_5_1 16.12.3+git20170331
+ _ZTVN13MailTransport25TransportManagementWidgetE@ABI_5_1 16.12.3+git20170331
+ _ZTVN13MailTransport7SmtpJobE@ABI_5_1 16.12.3+git20170331
+ _ZTVN13MailTransport9TransportE@ABI_5_1 16.12.3+git20170331
+ _ZZZN13MailTransport13TransportBase11setUserNameERK7QStringENKUlvE_clEvE15qstring_literal@ABI_5_1 16.12.3+git20170331
+ _ZZZN13MailTransport13TransportBase13setEncryptionEiENKUlvE_clEvE15qstring_literal@ABI_5_1 16.12.3+git20170331
+ _ZZZN13MailTransport13TransportBase16setStorePasswordEbENKUlvE_clEvE15qstring_literal@ABI_5_1 16.12.3+git20170331
+ _ZZZN13MailTransport13TransportBase5setIdEiENKUlvE_clEvE15qstring_literal@ABI_5_1 16.12.3+git20170331
+ _ZZZN13MailTransport13TransportBase7setHostERK7QStringENKUlvE_clEvE15qstring_literal@ABI_5_1 16.12.3+git20170331
+ _ZZZN13MailTransport13TransportBase7setNameERK7QStringENKUlvE_clEvE15qstring_literal@ABI_5_1 16.12.3+git20170331
+ _ZZZN13MailTransport13TransportBase7setTypeEiENKUlvE_clEvE15qstring_literal@ABI_5_1 16.12.3+git20170331
+ (c++)"non-virtual thunk to MailTransport::TransportComboBox::~TransportComboBox()@ABI_5_1" 16.12.3+git20170331
+ (c++)"non-virtual thunk to MailTransport::TransportManagementWidget::~TransportManagementWidget()@ABI_5_1" 16.12.3+git20170331
diff -Nru kmailtransport-16.12.3/debian/libkf5mailtransport5.install kmailtransport-17.04.3/debian/libkf5mailtransport5.install
--- kmailtransport-16.12.3/debian/libkf5mailtransport5.install	2017-05-01 19:26:39.000000000 +0000
+++ kmailtransport-17.04.3/debian/libkf5mailtransport5.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib/*/libKF5MailTransport.so.5.*
-usr/lib/*/libKF5MailTransport.so.5
diff -Nru kmailtransport-16.12.3/debian/libkf5mailtransport5.symbols kmailtransport-17.04.3/debian/libkf5mailtransport5.symbols
--- kmailtransport-16.12.3/debian/libkf5mailtransport5.symbols	2017-05-01 19:26:39.000000000 +0000
+++ kmailtransport-17.04.3/debian/libkf5mailtransport5.symbols	1970-01-01 00:00:00.000000000 +0000
@@ -1,361 +0,0 @@
-# SymbolsHelper-Confirmed: 16.12.0 amd64 arm64 armhf i386 ppc64el
-libKF5MailTransport.so.5 libkf5mailtransport5 #MINVER#
- _ZN13MailTransport10ServerTest11qt_metacallEN11QMetaObject4CallEiPPv@Base 15.08.0
- _ZN13MailTransport10ServerTest11qt_metacastEPKc@Base 15.08.0
- _ZN13MailTransport10ServerTest11setProtocolERK7QString@Base 15.08.0
- _ZN13MailTransport10ServerTest14setProgressBarEP12QProgressBar@Base 15.08.0
- _ZN13MailTransport10ServerTest15setFakeHostnameERK7QString@Base 15.08.0
- _ZN13MailTransport10ServerTest16staticMetaObjectE@Base 15.08.0
- _ZN13MailTransport10ServerTest5startEv@Base 15.08.0
- _ZN13MailTransport10ServerTest7setPortENS_13TransportBase14EnumEncryption4typeEj@Base 15.08.0
- _ZN13MailTransport10ServerTest8finishedERK5QListIiE@Base 15.08.0
- _ZN13MailTransport10ServerTest9setServerERK7QString@Base 15.08.0
- _ZN13MailTransport10ServerTestC1EP7QObject@Base 15.08.1
- _ZN13MailTransport10ServerTestC2EP7QObject@Base 15.08.1
- _ZN13MailTransport10ServerTestD0Ev@Base 15.08.0
- _ZN13MailTransport10ServerTestD1Ev@Base 15.08.0
- _ZN13MailTransport10ServerTestD2Ev@Base 15.08.0
- _ZN13MailTransport12TransportJob11qt_metacallEN11QMetaObject4CallEiPPv@Base 16.12.0
- _ZN13MailTransport12TransportJob11qt_metacastEPKc@Base 16.12.0
- _ZN13MailTransport12TransportJob16staticMetaObjectE@Base 16.12.0
- _ZN13MailTransport12TransportJob5setCcERK11QStringList@Base 15.08.0
- _ZN13MailTransport12TransportJob5setToERK11QStringList@Base 15.08.0
- _ZN13MailTransport12TransportJob5startEv@Base 15.08.0
- _ZN13MailTransport12TransportJob6bufferEv@Base 15.08.0
- _ZN13MailTransport12TransportJob6setBccERK11QStringList@Base 15.08.0
- _ZN13MailTransport12TransportJob7setDataERK10QByteArray@Base 15.08.0
- _ZN13MailTransport12TransportJob9setSenderERK7QString@Base 15.08.0
- _ZN13MailTransport12TransportJobC1EPNS_9TransportEP7QObject@Base 15.08.0
- _ZN13MailTransport12TransportJobC2EPNS_9TransportEP7QObject@Base 15.08.0
- _ZN13MailTransport12TransportJobD0Ev@Base 15.08.0
- _ZN13MailTransport12TransportJobD1Ev@Base 15.08.0
- _ZN13MailTransport12TransportJobD2Ev@Base 15.08.0
- _ZN13MailTransport13PrecommandJob11qt_metacallEN11QMetaObject4CallEiPPv@Base 15.08.0
- _ZN13MailTransport13PrecommandJob11qt_metacastEPKc@Base 15.08.0
- _ZN13MailTransport13PrecommandJob16staticMetaObjectE@Base 15.08.0
- _ZN13MailTransport13PrecommandJob5startEv@Base 15.08.0
- _ZN13MailTransport13PrecommandJob6doKillEv@Base 15.08.0
- _ZN13MailTransport13PrecommandJobC1ERK7QStringP7QObject@Base 15.08.0
- _ZN13MailTransport13PrecommandJobC2ERK7QStringP7QObject@Base 15.08.0
- _ZN13MailTransport13PrecommandJobD0Ev@Base 15.08.0
- _ZN13MailTransport13PrecommandJobD1Ev@Base 15.08.0
- _ZN13MailTransport13PrecommandJobD2Ev@Base 15.08.0
- _ZN13MailTransport13TransportBaseC1ERK7QString@Base 15.08.0
- _ZN13MailTransport13TransportBaseC2ERK7QString@Base 15.08.0
- _ZN13MailTransport13TransportBaseD0Ev@Base 15.08.0
- _ZN13MailTransport13TransportBaseD1Ev@Base 15.08.0
- _ZN13MailTransport13TransportBaseD2Ev@Base 15.08.0
- _ZN13MailTransport13TransportTypeC1ERKS0_@Base 15.08.0
- _ZN13MailTransport13TransportTypeC1Ev@Base 15.08.0
- _ZN13MailTransport13TransportTypeC2ERKS0_@Base 15.08.0
- _ZN13MailTransport13TransportTypeC2Ev@Base 15.08.0
- _ZN13MailTransport13TransportTypeD1Ev@Base 15.08.0
- _ZN13MailTransport13TransportTypeD2Ev@Base 15.08.0
- _ZN13MailTransport13TransportTypeaSERKS0_@Base 15.08.0
- _ZN13MailTransport14ErrorAttribute10setMessageERK7QString@Base 15.08.0
- _ZN13MailTransport14ErrorAttribute11deserializeERK10QByteArray@Base 15.08.0
- _ZN13MailTransport14ErrorAttributeC1ERK7QString@Base 15.08.0
- _ZN13MailTransport14ErrorAttributeC2ERK7QString@Base 15.08.0
- _ZN13MailTransport14ErrorAttributeD0Ev@Base 15.08.0
- _ZN13MailTransport14ErrorAttributeD1Ev@Base 15.08.0
- _ZN13MailTransport14ErrorAttributeD2Ev@Base 15.08.0
- _ZN13MailTransport15MessageQueueJob10setMessageERK14QSharedPointerIN5KMime7MessageEE@Base 15.08.1
- _ZN13MailTransport15MessageQueueJob10slotResultEP4KJob@Base 15.08.0
- _ZN13MailTransport15MessageQueueJob11qt_metacallEN11QMetaObject4CallEiPPv@Base 15.08.0
- _ZN13MailTransport15MessageQueueJob11qt_metacastEPKc@Base 15.08.0
- _ZN13MailTransport15MessageQueueJob16addressAttributeEv@Base 15.08.0
- _ZN13MailTransport15MessageQueueJob16staticMetaObjectE@Base 15.08.0
- _ZN13MailTransport15MessageQueueJob18transportAttributeEv@Base 15.08.0
- _ZN13MailTransport15MessageQueueJob19sentActionAttributeEv@Base 15.08.0
- _ZN13MailTransport15MessageQueueJob21dispatchModeAttributeEv@Base 15.08.0
- _ZN13MailTransport15MessageQueueJob22sentBehaviourAttributeEv@Base 15.08.0
- _ZN13MailTransport15MessageQueueJob5startEv@Base 15.08.0
- _ZN13MailTransport15MessageQueueJobC1EP7QObject@Base 15.08.0
- _ZN13MailTransport15MessageQueueJobC2EP7QObject@Base 15.08.0
- _ZN13MailTransport15MessageQueueJobD0Ev@Base 15.08.0
- _ZN13MailTransport15MessageQueueJobD1Ev@Base 15.08.0
- _ZN13MailTransport15MessageQueueJobD2Ev@Base 15.08.0
- _ZN13MailTransport16TransportManager11qt_metacallEN11QMetaObject4CallEiPPv@Base 15.08.0
- _ZN13MailTransport16TransportManager11qt_metacastEPKc@Base 15.08.0
- _ZN13MailTransport16TransportManager12addTransportEPNS_9TransportE@Base 15.08.0
- _ZN13MailTransport16TransportManager13loadPasswordsEv@Base 15.08.0
- _ZN13MailTransport16TransportManager15removeTransportEi@Base 15.08.0
- _ZN13MailTransport16TransportManager16changesCommittedEv@Base 15.08.0
- _ZN13MailTransport16TransportManager16passwordsChangedEv@Base 15.08.0
- _ZN13MailTransport16TransportManager16staticMetaObjectE@Base 15.08.0
- _ZN13MailTransport16TransportManager16transportRemovedEiRK7QString@Base 15.08.0
- _ZN13MailTransport16TransportManager16transportRenamedEiRK7QStringS3_@Base 15.08.0
- _ZN13MailTransport16TransportManager17transportsChangedEv@Base 15.08.0
- _ZN13MailTransport16TransportManager18configureTransportEPNS_9TransportEP7QWidget@Base 15.08.0
- _ZN13MailTransport16TransportManager18createTransportJobERK7QString@Base 15.08.0
- _ZN13MailTransport16TransportManager18createTransportJobEi@Base 15.08.0
- _ZN13MailTransport16TransportManager18loadPasswordsAsyncEv@Base 15.08.0
- _ZN13MailTransport16TransportManager19setDefaultTransportEi@Base 15.08.0
- _ZN13MailTransport16TransportManager20emitChangesCommittedEv@Base 15.08.0
- _ZN13MailTransport16TransportManager22createDefaultTransportEv@Base 15.08.0
- _ZN13MailTransport16TransportManager27showTransportCreationDialogEP7QWidgetNS0_13ShowConditionE@Base 15.08.0
- _ZN13MailTransport16TransportManager4selfEv@Base 15.08.0
- _ZN13MailTransport16TransportManager6walletEv@Base 15.08.0
- _ZN13MailTransport16TransportManager8scheduleEPNS_12TransportJobE@Base 15.08.0
- _ZN13MailTransport16TransportManagerC1Ev@Base 15.08.0
- _ZN13MailTransport16TransportManagerC2Ev@Base 15.08.0
- _ZN13MailTransport16TransportManagerD0Ev@Base 15.08.0
- _ZN13MailTransport16TransportManagerD1Ev@Base 15.08.0
- _ZN13MailTransport16TransportManagerD2Ev@Base 15.08.0
- _ZN13MailTransport17TransportComboBox11qt_metacallEN11QMetaObject4CallEiPPv@Base 15.08.0
- _ZN13MailTransport17TransportComboBox11qt_metacastEPKc@Base 15.08.0
- _ZN13MailTransport17TransportComboBox16setTransportListERK5QListIiE@Base 15.08.0
- _ZN13MailTransport17TransportComboBox16staticMetaObjectE@Base 15.08.0
- _ZN13MailTransport17TransportComboBox18updateComboboxListEv@Base 15.08.0
- _ZN13MailTransport17TransportComboBox19setCurrentTransportEi@Base 15.08.0
- _ZN13MailTransport17TransportComboBoxC1EP7QWidget@Base 15.08.0
- _ZN13MailTransport17TransportComboBoxC2EP7QWidget@Base 15.08.0
- _ZN13MailTransport17TransportComboBoxD0Ev@Base 15.08.0
- _ZN13MailTransport17TransportComboBoxD1Ev@Base 15.08.0
- _ZN13MailTransport17TransportComboBoxD2Ev@Base 15.08.0
- _ZN13MailTransport18TransportAttribute11deserializeERK10QByteArray@Base 15.08.0
- _ZN13MailTransport18TransportAttribute14setTransportIdEi@Base 15.08.0
- _ZN13MailTransport18TransportAttributeC1Ei@Base 15.08.0
- _ZN13MailTransport18TransportAttributeC2Ei@Base 15.08.0
- _ZN13MailTransport18TransportAttributeD0Ev@Base 15.08.0
- _ZN13MailTransport18TransportAttributeD1Ev@Base 15.08.0
- _ZN13MailTransport18TransportAttributeD2Ev@Base 15.08.0
- _ZN13MailTransport19DispatcherInterface16dispatchManuallyEv@Base 15.08.0
- _ZN13MailTransport19DispatcherInterface16retryDispatchingEv@Base 15.08.0
- _ZN13MailTransport19DispatcherInterface23dispatchManualTransportEi@Base 15.08.0
- _ZN13MailTransport19DispatcherInterfaceC1Ev@Base 15.08.0
- _ZN13MailTransport19DispatcherInterfaceC2Ev@Base 15.08.0
- _ZN13MailTransport19SentActionAttribute11deserializeERK10QByteArray@Base 15.08.0
- _ZN13MailTransport19SentActionAttribute6ActionC1ENS1_4TypeERK8QVariant@Base 15.08.0
- _ZN13MailTransport19SentActionAttribute6ActionC1ERKS1_@Base 15.08.0
- _ZN13MailTransport19SentActionAttribute6ActionC1Ev@Base 15.08.0
- _ZN13MailTransport19SentActionAttribute6ActionC2ENS1_4TypeERK8QVariant@Base 15.08.0
- _ZN13MailTransport19SentActionAttribute6ActionC2ERKS1_@Base 15.08.0
- _ZN13MailTransport19SentActionAttribute6ActionC2Ev@Base 15.08.0
- _ZN13MailTransport19SentActionAttribute6ActionD1Ev@Base 15.08.0
- _ZN13MailTransport19SentActionAttribute6ActionD2Ev@Base 15.08.0
- _ZN13MailTransport19SentActionAttribute6ActionaSERKS1_@Base 15.08.0
- _ZN13MailTransport19SentActionAttribute9addActionENS0_6Action4TypeERK8QVariant@Base 15.08.0
- _ZN13MailTransport19SentActionAttributeC1Ev@Base 15.08.0
- _ZN13MailTransport19SentActionAttributeC2Ev@Base 15.08.0
- _ZN13MailTransport19SentActionAttributeD0Ev@Base 15.08.0
- _ZN13MailTransport19SentActionAttributeD1Ev@Base 15.08.0
- _ZN13MailTransport19SentActionAttributeD2Ev@Base 15.08.0
- _ZN13MailTransport21DispatchModeAttribute11deserializeERK10QByteArray@Base 15.08.0
- _ZN13MailTransport21DispatchModeAttribute12setSendAfterERK9QDateTime@Base 15.08.0
- _ZN13MailTransport21DispatchModeAttribute15setDispatchModeENS0_12DispatchModeE@Base 15.08.0
- _ZN13MailTransport21DispatchModeAttributeC1ENS0_12DispatchModeE@Base 15.08.0
- _ZN13MailTransport21DispatchModeAttributeC2ENS0_12DispatchModeE@Base 15.08.0
- _ZN13MailTransport21DispatchModeAttributeD0Ev@Base 15.08.0
- _ZN13MailTransport21DispatchModeAttributeD1Ev@Base 15.08.0
- _ZN13MailTransport21DispatchModeAttributeD2Ev@Base 15.08.0
- _ZN13MailTransport22SentBehaviourAttribute11deserializeERK10QByteArray@Base 15.08.0
- _ZN13MailTransport22SentBehaviourAttribute15setSendSilentlyEb@Base 16.12.0
- _ZN13MailTransport22SentBehaviourAttribute16setSentBehaviourENS0_13SentBehaviourE@Base 15.08.0
- _ZN13MailTransport22SentBehaviourAttribute19setMoveToCollectionERKN7Akonadi10CollectionE@Base 15.08.0
- _ZN13MailTransport22SentBehaviourAttributeC1ENS0_13SentBehaviourERKN7Akonadi10CollectionEb@Base 16.12.0
- _ZN13MailTransport22SentBehaviourAttributeC2ENS0_13SentBehaviourERKN7Akonadi10CollectionEb@Base 16.12.0
- _ZN13MailTransport22SentBehaviourAttributeD0Ev@Base 15.08.0
- _ZN13MailTransport22SentBehaviourAttributeD1Ev@Base 15.08.0
- _ZN13MailTransport22SentBehaviourAttributeD2Ev@Base 15.08.0
- _ZN13MailTransport25TransportManagementWidget11qt_metacallEN11QMetaObject4CallEiPPv@Base 15.08.0
- _ZN13MailTransport25TransportManagementWidget11qt_metacastEPKc@Base 15.08.0
- _ZN13MailTransport25TransportManagementWidget16staticMetaObjectE@Base 15.08.0
- _ZN13MailTransport25TransportManagementWidgetC1EP7QWidget@Base 15.08.0
- _ZN13MailTransport25TransportManagementWidgetC2EP7QWidget@Base 15.08.0
- _ZN13MailTransport25TransportManagementWidgetD0Ev@Base 15.08.0
- _ZN13MailTransport25TransportManagementWidgetD1Ev@Base 15.08.0
- _ZN13MailTransport25TransportManagementWidgetD2Ev@Base 15.08.0
- _ZN13MailTransport7SmtpJob10slaveErrorEPN3KIO5SlaveEiRK7QString@Base 16.12.0
- _ZN13MailTransport7SmtpJob10slotResultEP4KJob@Base 16.12.0
- _ZN13MailTransport7SmtpJob11dataRequestEPN3KIO3JobER10QByteArray@Base 16.12.0
- _ZN13MailTransport7SmtpJob11qt_metacallEN11QMetaObject4CallEiPPv@Base 16.12.0
- _ZN13MailTransport7SmtpJob11qt_metacastEPKc@Base 16.12.0
- _ZN13MailTransport7SmtpJob12startSmtpJobEv@Base 16.12.0
- _ZN13MailTransport7SmtpJob16staticMetaObjectE@Base 16.12.0
- _ZN13MailTransport7SmtpJob6doKillEv@Base 16.12.0
- _ZN13MailTransport7SmtpJob7doStartEv@Base 16.12.0
- _ZN13MailTransport7SmtpJobC1EPNS_9TransportEP7QObject@Base 16.12.0
- _ZN13MailTransport7SmtpJobC2EPNS_9TransportEP7QObject@Base 16.12.0
- _ZN13MailTransport7SmtpJobD0Ev@Base 16.12.0
- _ZN13MailTransport7SmtpJobD1Ev@Base 16.12.0
- _ZN13MailTransport7SmtpJobD2Ev@Base 16.12.0
- _ZN13MailTransport9Transport11qt_metacallEN11QMetaObject4CallEiPPv@Base 15.08.0
- _ZN13MailTransport9Transport11qt_metacastEPKc@Base 15.08.0
- _ZN13MailTransport9Transport11setPasswordERK7QString@Base 15.08.0
- _ZN13MailTransport9Transport12readPasswordEv@Base 15.08.0
- _ZN13MailTransport9Transport15forceUniqueNameEv@Base 15.08.0
- _ZN13MailTransport9Transport15migrateToWalletEv@Base 15.08.0
- _ZN13MailTransport9Transport16setTransportTypeERKNS_13TransportTypeE@Base 15.08.0
- _ZN13MailTransport9Transport16staticMetaObjectE@Base 15.08.0
- _ZN13MailTransport9Transport19updatePasswordStateEv@Base 15.08.0
- _ZN13MailTransport9Transport24authenticationTypeStringEi@Base 15.08.0
- _ZN13MailTransport9Transport7usrReadEv@Base 15.08.0
- _ZN13MailTransport9Transport7usrSaveEv@Base 15.08.0
- _ZN13MailTransport9Transport8passwordEv@Base 15.08.0
- _ZN13MailTransport9TransportC1ERK7QString@Base 15.08.0
- _ZN13MailTransport9TransportC2ERK7QString@Base 15.08.0
- _ZN13MailTransport9TransportD0Ev@Base 15.08.0
- _ZN13MailTransport9TransportD1Ev@Base 15.08.0
- _ZN13MailTransport9TransportD2Ev@Base 15.08.0
- _ZN7Akonadi12FilterActionD0Ev@Base 15.08.0
- _ZN7Akonadi12FilterActionD1Ev@Base 15.08.0
- _ZN7Akonadi12FilterActionD2Ev@Base 15.08.0
- _ZN7Akonadi15FilterActionJob11qt_metacallEN11QMetaObject4CallEiPPv@Base 15.08.0
- _ZN7Akonadi15FilterActionJob11qt_metacastEPKc@Base 15.08.0
- _ZN7Akonadi15FilterActionJob16staticMetaObjectE@Base 15.08.0
- _ZN7Akonadi15FilterActionJob7doStartEv@Base 15.08.0
- _ZN7Akonadi15FilterActionJobC1ERK7QVectorINS_4ItemEEPNS_12FilterActionEP7QObject@Base 15.08.0
- _ZN7Akonadi15FilterActionJobC1ERKNS_10CollectionEPNS_12FilterActionEP7QObject@Base 15.08.0
- _ZN7Akonadi15FilterActionJobC1ERKNS_4ItemEPNS_12FilterActionEP7QObject@Base 15.08.0
- _ZN7Akonadi15FilterActionJobC2ERK7QVectorINS_4ItemEEPNS_12FilterActionEP7QObject@Base 15.08.0
- _ZN7Akonadi15FilterActionJobC2ERKNS_10CollectionEPNS_12FilterActionEP7QObject@Base 15.08.0
- _ZN7Akonadi15FilterActionJobC2ERKNS_4ItemEPNS_12FilterActionEP7QObject@Base 15.08.0
- _ZN7Akonadi15FilterActionJobD0Ev@Base 15.08.0
- _ZN7Akonadi15FilterActionJobD1Ev@Base 15.08.0
- _ZN7Akonadi15FilterActionJobD2Ev@Base 15.08.0
- (optional=templinst)_ZN7Akonadi16AttributeFactory17registerAttributeIN13MailTransport14ErrorAttributeEEEvv@Base 15.08.0
- (optional=templinst)_ZN7Akonadi16AttributeFactory17registerAttributeIN13MailTransport22SentBehaviourAttributeEEEvv@Base 15.08.0
- (optional=templinst)_ZN7Akonadi4Item14setPayloadImplI14QSharedPointerIN5KMime7MessageEEEENSt9enable_ifIXntsrNS_8Internal12PayloadTraitIT_EE13isPolymorphicEvE4typeERKS9_@Base 15.08.1
- (optional=templinst)_ZNK12KConfigGroup9readEntryI5QSizeEET_PKcRKS2_@Base 15.08.0
- (optional=templinst|arch=!arm64 !ppc64el)_ZNK12KConfigGroup9readEntryIiEET_PKcRKS1_@Base 15.08.0
- _ZNK13MailTransport10ServerTest10metaObjectEv@Base 15.08.0
- _ZNK13MailTransport10ServerTest11progressBarEv@Base 15.08.1
- _ZNK13MailTransport10ServerTest12capabilitiesEv@Base 15.08.0
- _ZNK13MailTransport10ServerTest12fakeHostnameEv@Base 15.08.1
- _ZNK13MailTransport10ServerTest12tlsProtocolsEv@Base 15.08.1
- _ZNK13MailTransport10ServerTest15normalProtocolsEv@Base 15.08.1
- _ZNK13MailTransport10ServerTest15secureProtocolsEv@Base 15.08.1
- _ZNK13MailTransport10ServerTest16isNormalPossibleEv@Base 15.08.1
- _ZNK13MailTransport10ServerTest16isSecurePossibleEv@Base 15.08.1
- _ZNK13MailTransport10ServerTest4portENS_13TransportBase14EnumEncryption4typeE@Base 15.08.1
- _ZNK13MailTransport10ServerTest6serverEv@Base 15.08.1
- _ZNK13MailTransport10ServerTest8protocolEv@Base 15.08.1
- _ZNK13MailTransport12TransportJob10metaObjectEv@Base 16.12.0
- _ZNK13MailTransport12TransportJob2ccEv@Base 15.08.0
- _ZNK13MailTransport12TransportJob2toEv@Base 15.08.0
- _ZNK13MailTransport12TransportJob3bccEv@Base 15.08.0
- _ZNK13MailTransport12TransportJob4dataEv@Base 15.08.0
- _ZNK13MailTransport12TransportJob6senderEv@Base 15.08.0
- _ZNK13MailTransport12TransportJob9transportEv@Base 15.08.0
- _ZNK13MailTransport13PrecommandJob10metaObjectEv@Base 15.08.0
- _ZNK13MailTransport13TransportType11descriptionEv@Base 15.08.0
- _ZNK13MailTransport13TransportType4nameEv@Base 15.08.0
- _ZNK13MailTransport13TransportType4typeEv@Base 15.08.0
- _ZNK13MailTransport13TransportType7isValidEv@Base 15.08.0
- _ZNK13MailTransport13TransportType9agentTypeEv@Base 15.08.0
- _ZNK13MailTransport13TransportTypeeqERKS0_@Base 15.08.0
- _ZNK13MailTransport14ErrorAttribute10serializedEv@Base 15.08.0
- _ZNK13MailTransport14ErrorAttribute4typeEv@Base 15.08.0
- _ZNK13MailTransport14ErrorAttribute5cloneEv@Base 15.08.0
- _ZNK13MailTransport14ErrorAttribute7messageEv@Base 15.08.0
- _ZNK13MailTransport15MessageQueueJob10metaObjectEv@Base 15.08.0
- _ZNK13MailTransport15MessageQueueJob7messageEv@Base 15.08.0
- _ZNK13MailTransport16TransportManager10metaObjectEv@Base 15.08.0
- _ZNK13MailTransport16TransportManager10transportsEv@Base 15.08.0
- _ZNK13MailTransport16TransportManager12transportIdsEv@Base 15.08.0
- _ZNK13MailTransport16TransportManager13transportByIdEib@Base 15.08.0
- _ZNK13MailTransport16TransportManager14transportNamesEv@Base 15.08.0
- _ZNK13MailTransport16TransportManager15createTransportEv@Base 15.08.0
- _ZNK13MailTransport16TransportManager15transportByNameERK7QStringb@Base 15.08.0
- _ZNK13MailTransport16TransportManager18defaultTransportIdEv@Base 15.08.0
- _ZNK13MailTransport16TransportManager20defaultTransportNameEv@Base 15.08.0
- _ZNK13MailTransport16TransportManager5typesEv@Base 15.08.0
- _ZNK13MailTransport16TransportManager7isEmptyEv@Base 15.08.0
- _ZNK13MailTransport17TransportComboBox10metaObjectEv@Base 15.08.0
- _ZNK13MailTransport17TransportComboBox13transportTypeEv@Base 15.08.0
- _ZNK13MailTransport17TransportComboBox18currentTransportIdEv@Base 15.08.0
- _ZNK13MailTransport18TransportAttribute10serializedEv@Base 15.08.0
- _ZNK13MailTransport18TransportAttribute11transportIdEv@Base 15.08.0
- _ZNK13MailTransport18TransportAttribute4typeEv@Base 15.08.0
- _ZNK13MailTransport18TransportAttribute5cloneEv@Base 15.08.0
- _ZNK13MailTransport18TransportAttribute9transportEv@Base 15.08.0
- _ZNK13MailTransport19DispatcherInterface18dispatcherInstanceEv@Base 15.08.0
- _ZNK13MailTransport19SentActionAttribute10serializedEv@Base 15.08.0
- _ZNK13MailTransport19SentActionAttribute4typeEv@Base 15.08.0
- _ZNK13MailTransport19SentActionAttribute5cloneEv@Base 15.08.0
- _ZNK13MailTransport19SentActionAttribute6Action4typeEv@Base 15.08.0
- _ZNK13MailTransport19SentActionAttribute6Action5valueEv@Base 15.08.0
- _ZNK13MailTransport19SentActionAttribute6ActioneqERKS1_@Base 15.08.0
- _ZNK13MailTransport19SentActionAttribute7actionsEv@Base 15.08.0
- _ZNK13MailTransport21DispatchModeAttribute10serializedEv@Base 15.08.0
- _ZNK13MailTransport21DispatchModeAttribute12dispatchModeEv@Base 15.08.0
- _ZNK13MailTransport21DispatchModeAttribute4typeEv@Base 15.08.0
- _ZNK13MailTransport21DispatchModeAttribute5cloneEv@Base 15.08.0
- _ZNK13MailTransport21DispatchModeAttribute9sendAfterEv@Base 15.08.0
- _ZNK13MailTransport22SentBehaviourAttribute10serializedEv@Base 15.08.0
- _ZNK13MailTransport22SentBehaviourAttribute12sendSilentlyEv@Base 16.12.0
- _ZNK13MailTransport22SentBehaviourAttribute13sentBehaviourEv@Base 15.08.0
- _ZNK13MailTransport22SentBehaviourAttribute16moveToCollectionEv@Base 15.08.0
- _ZNK13MailTransport22SentBehaviourAttribute4typeEv@Base 15.08.0
- _ZNK13MailTransport22SentBehaviourAttribute5cloneEv@Base 15.08.0
- _ZNK13MailTransport25TransportManagementWidget10metaObjectEv@Base 15.08.0
- _ZNK13MailTransport7SmtpJob10metaObjectEv@Base 16.12.0
- _ZNK13MailTransport9Transport10isCompleteEv@Base 15.08.0
- _ZNK13MailTransport9Transport10metaObjectEv@Base 15.08.0
- _ZNK13MailTransport9Transport13transportTypeEv@Base 15.08.0
- _ZNK13MailTransport9Transport20needsWalletMigrationEv@Base 15.08.0
- _ZNK13MailTransport9Transport24authenticationTypeStringEv@Base 15.08.0
- _ZNK13MailTransport9Transport5cloneEv@Base 15.08.0
- _ZNK13MailTransport9Transport7isValidEv@Base 15.08.0
- _ZNK7Akonadi15FilterActionJob10metaObjectEv@Base 15.08.0
- _ZTIN13MailTransport10ServerTestE@Base 15.08.0
- _ZTIN13MailTransport12TransportJobE@Base 15.08.0
- _ZTIN13MailTransport13PrecommandJobE@Base 15.08.0
- _ZTIN13MailTransport13TransportBaseE@Base 15.08.0
- _ZTIN13MailTransport14ErrorAttributeE@Base 15.08.0
- _ZTIN13MailTransport15MessageQueueJobE@Base 15.08.0
- _ZTIN13MailTransport16TransportManagerE@Base 15.08.0
- _ZTIN13MailTransport17TransportComboBoxE@Base 15.08.0
- _ZTIN13MailTransport18TransportAttributeE@Base 15.08.0
- _ZTIN13MailTransport19SentActionAttributeE@Base 15.08.0
- _ZTIN13MailTransport21DispatchModeAttributeE@Base 15.08.0
- _ZTIN13MailTransport22SentBehaviourAttributeE@Base 15.08.0
- _ZTIN13MailTransport25TransportManagementWidgetE@Base 15.08.0
- _ZTIN13MailTransport7SmtpJobE@Base 16.12.0
- _ZTIN13MailTransport9TransportE@Base 15.08.0
- _ZTIN7Akonadi12FilterActionE@Base 15.08.0
- _ZTIN7Akonadi15FilterActionJobE@Base 15.08.0
- _ZTSN13MailTransport10ServerTestE@Base 15.08.0
- _ZTSN13MailTransport12TransportJobE@Base 15.08.0
- _ZTSN13MailTransport13PrecommandJobE@Base 15.08.0
- _ZTSN13MailTransport13TransportBaseE@Base 15.08.0
- _ZTSN13MailTransport14ErrorAttributeE@Base 15.08.0
- _ZTSN13MailTransport15MessageQueueJobE@Base 15.08.0
- _ZTSN13MailTransport16TransportManagerE@Base 15.08.0
- _ZTSN13MailTransport17TransportComboBoxE@Base 15.08.0
- _ZTSN13MailTransport18TransportAttributeE@Base 15.08.0
- _ZTSN13MailTransport19SentActionAttributeE@Base 15.08.0
- _ZTSN13MailTransport21DispatchModeAttributeE@Base 15.08.0
- _ZTSN13MailTransport22SentBehaviourAttributeE@Base 15.08.0
- _ZTSN13MailTransport25TransportManagementWidgetE@Base 15.08.0
- _ZTSN13MailTransport7SmtpJobE@Base 16.12.0
- _ZTSN13MailTransport9TransportE@Base 15.08.0
- _ZTSN7Akonadi12FilterActionE@Base 15.08.0
- _ZTSN7Akonadi15FilterActionJobE@Base 15.08.0
- _ZTVN13MailTransport10ServerTestE@Base 15.08.0
- _ZTVN13MailTransport12TransportJobE@Base 15.08.0
- _ZTVN13MailTransport13PrecommandJobE@Base 15.08.0
- _ZTVN13MailTransport13TransportBaseE@Base 15.08.0
- _ZTVN13MailTransport14ErrorAttributeE@Base 15.08.0
- _ZTVN13MailTransport15MessageQueueJobE@Base 15.08.0
- _ZTVN13MailTransport16TransportManagerE@Base 15.08.0
- _ZTVN13MailTransport17TransportComboBoxE@Base 15.08.0
- _ZTVN13MailTransport18TransportAttributeE@Base 15.08.0
- _ZTVN13MailTransport19SentActionAttributeE@Base 15.08.0
- _ZTVN13MailTransport21DispatchModeAttributeE@Base 15.08.0
- _ZTVN13MailTransport22SentBehaviourAttributeE@Base 15.08.0
- _ZTVN13MailTransport25TransportManagementWidgetE@Base 15.08.0
- _ZTVN13MailTransport7SmtpJobE@Base 16.12.0
- _ZTVN13MailTransport9TransportE@Base 15.08.0
- _ZTVN7Akonadi12FilterActionE@Base 15.08.0
- _ZTVN7Akonadi15FilterActionJobE@Base 15.08.0
- _ZZZN13MailTransport13TransportBase11setUserNameERK7QStringENKUlvE_clEvE15qstring_literal@Base 15.08.1
- _ZZZN13MailTransport13TransportBase13setEncryptionEiENKUlvE_clEvE15qstring_literal@Base 15.08.1
- _ZZZN13MailTransport13TransportBase16setStorePasswordEbENKUlvE_clEvE15qstring_literal@Base 15.08.1
- _ZZZN13MailTransport13TransportBase5setIdEiENKUlvE_clEvE15qstring_literal@Base 15.08.1
- _ZZZN13MailTransport13TransportBase7setHostERK7QStringENKUlvE_clEvE15qstring_literal@Base 15.08.1
- _ZZZN13MailTransport13TransportBase7setNameERK7QStringENKUlvE_clEvE15qstring_literal@Base 15.08.1
- _ZZZN13MailTransport13TransportBase7setTypeEiENKUlvE_clEvE15qstring_literal@Base 15.08.1
- (c++)"non-virtual thunk to MailTransport::TransportComboBox::~TransportComboBox()@Base" 15.08.0
- (c++)"non-virtual thunk to MailTransport::TransportManagementWidget::~TransportManagementWidget()@Base" 15.08.0
diff -Nru kmailtransport-16.12.3/debian/libkf5mailtransportakonadi5.install kmailtransport-17.04.3/debian/libkf5mailtransportakonadi5.install
--- kmailtransport-16.12.3/debian/libkf5mailtransportakonadi5.install	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/debian/libkf5mailtransportakonadi5.install	2017-08-21 13:32:08.000000000 +0000
@@ -0,0 +1,2 @@
+usr/lib/*/libKF5MailTransportAkonadi.so.5
+usr/lib/*/libKF5MailTransportAkonadi.so.5.*
diff -Nru kmailtransport-16.12.3/debian/libkf5mailtransport-data.install kmailtransport-17.04.3/debian/libkf5mailtransport-data.install
--- kmailtransport-16.12.3/debian/libkf5mailtransport-data.install	2017-05-01 19:26:39.000000000 +0000
+++ kmailtransport-17.04.3/debian/libkf5mailtransport-data.install	2017-08-21 13:32:08.000000000 +0000
@@ -1,2 +1,3 @@
 usr/share/config.kcfg/mailtransport.kcfg
 usr/share/kservices5/kcm_mailtransport.desktop
+usr/share/locale/*/LC_MESSAGES/libmailtransport5.mo
diff -Nru kmailtransport-16.12.3/debian/libkf5mailtransport-dev.install kmailtransport-17.04.3/debian/libkf5mailtransport-dev.install
--- kmailtransport-16.12.3/debian/libkf5mailtransport-dev.install	2017-05-01 19:26:39.000000000 +0000
+++ kmailtransport-17.04.3/debian/libkf5mailtransport-dev.install	2017-08-21 13:32:08.000000000 +0000
@@ -1,6 +1,16 @@
-usr/include/KF5/MailTransport/MailTransport/
-usr/include/KF5/MailTransport/mailtransport/
+usr/include/KF5/MailTransport/
+usr/include/KF5/MailTransport/
+usr/include/KF5/MailTransportAkonadi/
+usr/include/KF5/mailtransport/
 usr/include/KF5/mailtransport_version.h
+usr/include/KF5/mailtransportakonadi/
+usr/include/KF5/mailtransportakonadi_version.h
 usr/lib/*/cmake/KF5MailTransport/
+usr/lib/*/cmake/KF5MailTransportAkonadi/KF5MailTransportAkonadiConfig.cmake
+usr/lib/*/cmake/KF5MailTransportAkonadi/KF5MailTransportAkonadiConfigVersion.cmake
+usr/lib/*/cmake/KF5MailTransportAkonadi/KF5MailTransportAkonadiTargets-debian.cmake
+usr/lib/*/cmake/KF5MailTransportAkonadi/KF5MailTransportAkonadiTargets.cmake
 usr/lib/*/libKF5MailTransport.so
+usr/lib/*/libKF5MailTransportAkonadi.so
 usr/lib/*/qt5/mkspecs/modules/qt_KMailTransport.pri
+usr/lib/*/qt5/mkspecs/modules/qt_KMailTransportAkonadi.pri
diff -Nru kmailtransport-16.12.3/debian/patches/enable_debian_abi_manager.diff kmailtransport-17.04.3/debian/patches/enable_debian_abi_manager.diff
--- kmailtransport-16.12.3/debian/patches/enable_debian_abi_manager.diff	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/debian/patches/enable_debian_abi_manager.diff	2017-08-21 13:32:08.000000000 +0000
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -64,3 +64,5 @@ ki18n_install(po)
+ if (KF5DocTools_FOUND)
+  kdoctools_install(po)
+ endif()
++
++include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
diff -Nru kmailtransport-16.12.3/debian/patches/series kmailtransport-17.04.3/debian/patches/series
--- kmailtransport-16.12.3/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/debian/patches/series	2017-08-21 13:32:08.000000000 +0000
@@ -0,0 +1 @@
+enable_debian_abi_manager.diff
diff -Nru kmailtransport-16.12.3/debian/rules kmailtransport-17.04.3/debian/rules
--- kmailtransport-16.12.3/debian/rules	2017-05-01 19:26:39.000000000 +0000
+++ kmailtransport-17.04.3/debian/rules	2017-08-21 13:32:08.000000000 +0000
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
+l10npkgs_firstversion_ok := 4:17.03.90-0~
+
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
 
 override_dh_strip:
 	$(overridden_command) --ddeb-migration='libkf5mailtransport-dbg (<= 15.12.0-1~~)'
diff -Nru kmailtransport-16.12.3/KF5MailTransportConfig.cmake.in kmailtransport-17.04.3/KF5MailTransportConfig.cmake.in
--- kmailtransport-16.12.3/KF5MailTransportConfig.cmake.in	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/KF5MailTransportConfig.cmake.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-@PACKAGE_INIT@
-
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_MODULE_PATH})
-
-find_dependency(KF5Wallet "@KF5_VERSION@")
-find_dependency(KF5AkonadiMime "@AKONADIMIME_LIB_VERSION@")
-find_dependency(KF5Mime "@KMIME_LIB_VERSION@")
-
-find_dependency(Sasl2)
-
-include(FeatureSummary)
-set_package_properties(Sasl2 PROPERTIES
-                             DESCRIPTION "The Cyrus-sasl library"
-                             URL "http://www.cyrussasl.org"
-)
-
-include("${CMAKE_CURRENT_LIST_DIR}/KF5MailTransportTargets.cmake")
diff -Nru kmailtransport-16.12.3/kioslave/src/common.h kmailtransport-17.04.3/kioslave/src/common.h
--- kmailtransport-16.12.3/kioslave/src/common.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/common.h	2017-06-19 05:09:24.000000000 +0000
@@ -33,8 +33,8 @@
 #ifdef Q_OS_WIN32  //krazy:exclude=cpp
     QByteArray libInstallPath(QFile::encodeName(QDir::toNativeSeparators(KGlobal::dirs()->installPath("lib") + QLatin1String("sasl2"))));
     QByteArray configPath(QFile::encodeName(QDir::toNativeSeparators(KGlobal::dirs()->installPath("config") + QLatin1String("sasl2"))));
-    if (sasl_set_path(SASL_PATH_TYPE_PLUGIN, libInstallPath.data()) != SASL_OK ||
-            sasl_set_path(SASL_PATH_TYPE_CONFIG, configPath.data()) != SASL_OK) {
+    if (sasl_set_path(SASL_PATH_TYPE_PLUGIN, libInstallPath.data()) != SASL_OK
+        || sasl_set_path(SASL_PATH_TYPE_CONFIG, configPath.data()) != SASL_OK) {
         fprintf(stderr, "SASL path initialization failed!\n");
         return false;
     }
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/capabilities.cpp kmailtransport-17.04.3/kioslave/src/smtp/capabilities.cpp
--- kmailtransport-16.12.3/kioslave/src/smtp/capabilities.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/capabilities.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -32,17 +32,15 @@
 #include "capabilities.h"
 #include "response.h"
 
-namespace KioSMTP
-{
-
+namespace KioSMTP {
 Capabilities Capabilities::fromResponse(const Response &ehlo)
 {
     Capabilities c;
 
     // first, check whether the response was valid and indicates success:
     if (!ehlo.isOk()
-            || ehlo.code() / 10 != 25 // ### restrict to 250 only?
-            || ehlo.lines().empty()) {
+        || ehlo.code() / 10 != 25     // ### restrict to 250 only?
+        || ehlo.lines().empty()) {
         return c;
     }
 
@@ -102,14 +100,14 @@
             result.push_back(QStringLiteral("SIZE"));    // indetermined
         }
     }
-    return result.join(QStringLiteral(" "));
+    return result.join(QLatin1Char(' '));
 }
 
 QStringList Capabilities::saslMethodsQSL() const
 {
     QStringList result;
     for (QMap<QString, QStringList>::const_iterator it = mCapabilities.begin();
-            it != mCapabilities.end(); ++it) {
+         it != mCapabilities.end(); ++it) {
         if (it.key() == QLatin1String("AUTH")) {
             result += it.value();
         } else if (it.key().startsWith(QLatin1String("AUTH="))) {
@@ -120,5 +118,4 @@
     result.removeDuplicates();
     return result;
 }
-
 } // namespace KioSMTP
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/capabilities.h kmailtransport-17.04.3/kioslave/src/smtp/capabilities.h
--- kmailtransport-16.12.3/kioslave/src/smtp/capabilities.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/capabilities.h	2017-06-19 05:09:24.000000000 +0000
@@ -36,9 +36,7 @@
 
 #include <QStringList>
 
-namespace KioSMTP
-{
-
+namespace KioSMTP {
 class Response;
 
 class Capabilities
@@ -61,10 +59,12 @@
     {
         return mCapabilities.find(cap.toUpper()) != mCapabilities.end();
     }
+
     bool have(const QByteArray &cap) const
     {
         return have(QString::fromLatin1(cap));
     }
+
     bool have(const char *cap) const
     {
         return have(QString::fromLatin1(cap));
@@ -81,7 +81,6 @@
 
     QMap<QString, QStringList> mCapabilities;
 };
-
 } // namespace KioSMTP
 
 #endif // __KIOSMTP_CAPABILITIES_H__
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/command.cpp kmailtransport-17.04.3/kioslave/src/smtp/command.cpp
--- kmailtransport-16.12.3/kioslave/src/smtp/command.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/command.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -43,18 +43,16 @@
 
 #include <assert.h>
 
-namespace KioSMTP
-{
-
+namespace KioSMTP {
 static const sasl_callback_t callbacks[] = {
-    { SASL_CB_ECHOPROMPT, NULL, NULL },
-    { SASL_CB_NOECHOPROMPT, NULL, NULL },
-    { SASL_CB_GETREALM, NULL, NULL },
-    { SASL_CB_USER, NULL, NULL },
-    { SASL_CB_AUTHNAME, NULL, NULL },
-    { SASL_CB_PASS, NULL, NULL },
-    { SASL_CB_CANON_USER, NULL, NULL },
-    { SASL_CB_LIST_END, NULL, NULL }
+    { SASL_CB_ECHOPROMPT, nullptr, nullptr },
+    { SASL_CB_NOECHOPROMPT, nullptr, nullptr },
+    { SASL_CB_GETREALM, nullptr, nullptr },
+    { SASL_CB_USER, nullptr, nullptr },
+    { SASL_CB_AUTHNAME, nullptr, nullptr },
+    { SASL_CB_PASS, nullptr, nullptr },
+    { SASL_CB_CANON_USER, nullptr, nullptr },
+    { SASL_CB_LIST_END, nullptr, nullptr }
 };
 
 //
@@ -103,7 +101,7 @@
     case QUIT:
         return new QuitCommand(smtp);
     default:
-        return 0;
+        return nullptr;
     }
 }
 
@@ -156,7 +154,7 @@
         return true;
     }
     mComplete = true;
-    if (r.code() / 10 ==  25) {   // 25x: success
+    if (r.code() / 10 == 25) {    // 25x: success
         parseFeatures(r);
         return true;
     }
@@ -207,30 +205,27 @@
 
 #define SASLERROR mSMTP->error(KIO::ERR_COULD_NOT_AUTHENTICATE, \
                                i18n("An error occurred during authentication: %1",  \
-                                    QString::fromUtf8( sasl_errdetail( conn ) )));
+                                    QString::fromUtf8(sasl_errdetail(conn))));
 
 //
 // AUTH - rfc 2554
 //
-AuthCommand::AuthCommand(SMTPSessionInterface *smtp,
-                         const char *mechanisms,
-                         const QString &aFQDN,
-                         KIO::AuthInfo &ai)
+AuthCommand::AuthCommand(SMTPSessionInterface *smtp, const char *mechanisms, const QString &aFQDN, KIO::AuthInfo &ai)
     : Command(smtp, CloseConnectionOnError | OnlyLastInPipeline)
     , mAi(&ai)
     , mFirstTime(true)
 {
-    mMechusing = 0;
+    mMechusing = nullptr;
     int result;
-    conn = 0;
-    client_interact = 0;
-    mOut = 0;
+    conn = nullptr;
+    client_interact = nullptr;
+    mOut = nullptr;
     mOutlen = 0;
     mOneStep = false;
 
     const QByteArray ba = aFQDN.toLatin1();
     result = sasl_client_new("smtp", ba.constData(),
-                             0, 0, callbacks, 0, &conn);
+                             nullptr, nullptr, callbacks, 0, &conn);
     if (result != SASL_OK) {
         SASLERROR
         return;
@@ -242,7 +237,7 @@
         if (result == SASL_INTERACT) {
             if (!saslInteract(client_interact)) {
                 return;
-            };
+            }
         }
     } while (result == SASL_INTERACT);
     if (result != SASL_CONTINUE && result != SASL_OK) {
@@ -260,21 +255,20 @@
     if (conn) {
         qCDebug(SMTP_LOG) << "dispose sasl connection";
         sasl_dispose(&conn);
-        conn = 0;
+        conn = nullptr;
     }
 }
 
 bool AuthCommand::saslInteract(void *in)
 {
     qCDebug(SMTP_LOG) << "saslInteract: ";
-    sasl_interact_t *interact = (sasl_interact_t *) in;
+    sasl_interact_t *interact = (sasl_interact_t *)in;
 
     //some mechanisms do not require username && pass, so don't need a popup
     //window for getting this info
     for (; interact->id != SASL_CB_LIST_END; interact++) {
-        if (interact->id == SASL_CB_AUTHNAME ||
-                interact->id == SASL_CB_PASS) {
-
+        if (interact->id == SASL_CB_AUTHNAME
+            || interact->id == SASL_CB_PASS) {
             if (mAi->username.isEmpty() || mAi->password.isEmpty()) {
                 if (!mSMTP->openPasswordDialog(*mAi)) {
                     mSMTP->error(KIO::ERR_ABORTED, i18n("No authentication details supplied."));
@@ -285,26 +279,28 @@
         }
     }
 
-    interact = (sasl_interact_t *) in;
+    interact = (sasl_interact_t *)in;
     while (interact->id != SASL_CB_LIST_END) {
         switch (interact->id) {
         case SASL_CB_USER:
-        case SASL_CB_AUTHNAME: {
+        case SASL_CB_AUTHNAME:
+        {
             qCDebug(SMTP_LOG) << "SASL_CB_[USER|AUTHNAME]: " << mAi->username;
             const QByteArray baUserName = mAi->username.toUtf8();
             interact->result = strdup(baUserName.constData());
-            interact->len = strlen((const char *) interact->result);
+            interact->len = strlen((const char *)interact->result);
             break;
         }
-        case SASL_CB_PASS: {
+        case SASL_CB_PASS:
+        {
             qCDebug(SMTP_LOG) << "SASL_CB_PASS: [HIDDEN]";
             const QByteArray baPassword = mAi->password.toUtf8();
             interact->result = strdup(baPassword.constData());
-            interact->len = strlen((const char *) interact->result);
+            interact->len = strlen((const char *)interact->result);
             break;
         }
         default:
-            interact->result = NULL;
+            interact->result = nullptr;
             interact->len = 0;
             break;
         }
@@ -336,7 +332,7 @@
     if (!mUngetSASLResponse.isNull()) {
         // implement un-ungetCommandLine
         cmd = mUngetSASLResponse;
-        mUngetSASLResponse = 0;
+        mUngetSASLResponse = nullptr;
     } else if (mFirstTime) {
         QString firstCommand = QLatin1String("AUTH ") + QString::fromLatin1(mMechusing);
 
@@ -355,14 +351,14 @@
         challenge = QByteArray::fromBase64(mLastChallenge);
         int result;
         do {
-            result = sasl_client_step(conn, challenge.isEmpty() ? 0 : challenge.data(),
+            result = sasl_client_step(conn, challenge.isEmpty() ? nullptr : challenge.data(),
                                       challenge.size(),
                                       &client_interact,
                                       &mOut, &mOutlen);
             if (result == SASL_INTERACT) {
                 if (!saslInteract(client_interact)) {
                     return "";
-                };
+                }
             }
         } while (result == SASL_INTERACT);
         if (result != SASL_CONTINUE && result != SASL_OK) {
@@ -535,7 +531,7 @@
 
     if (!mUngetBuffer.isEmpty()) {
         const QByteArray ret = mUngetBuffer;
-        mUngetBuffer = 0;
+        mUngetBuffer = nullptr;
         if (mWasComplete) {
             mComplete = true;
             mNeedResponse = true;
@@ -557,7 +553,7 @@
                              i18n("Could not read data from application."));
         mComplete = true;
         mNeedResponse = true;
-        return 0;
+        return nullptr;
     }
     mComplete = true;
     mNeedResponse = true;
@@ -603,7 +599,7 @@
 QByteArray TransferCommand::prepare(const QByteArray &ba)
 {
     if (ba.isEmpty()) {
-        return 0;
+        return nullptr;
     }
     if (mSMTP->lf2crlfAndDotStuffingRequested()) {
         qCDebug(SMTP_LOG) << "performing dotstuffing and LF->CRLF transformation";
@@ -649,5 +645,4 @@
     mNeedResponse = true;
     return "QUIT\r\n";
 }
-
 } // namespace KioSMTP
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/command.h kmailtransport-17.04.3/kioslave/src/smtp/command.h
--- kmailtransport-16.12.3/kioslave/src/smtp/command.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/command.h	2017-06-19 05:09:24.000000000 +0000
@@ -41,9 +41,7 @@
 
 #include <kio/authinfo.h>
 
-namespace KioSMTP
-{
-
+namespace KioSMTP {
 class Response;
 class TransactionState;
 class SMTPSessionInterface;
@@ -145,10 +143,12 @@
     {
         return mFlags & CloseConnectionOnError;
     }
+
     bool mustBeLastInPipeline() const
     {
         return mFlags & OnlyLastInPipeline;
     }
+
     bool mustBeFirstInPipeline() const
     {
         return mFlags & OnlyFirstInPipeline;
@@ -200,8 +200,7 @@
 class AuthCommand : public Command
 {
 public:
-    AuthCommand(SMTPSessionInterface *smtp, const char *mechanisms,
-                const QString &aFQDN, KIO::AuthInfo &ai);
+    AuthCommand(SMTPSessionInterface *smtp, const char *mechanisms, const QString &aFQDN, KIO::AuthInfo &ai);
     ~AuthCommand();
     bool doNotExecute(const TransactionState *ts) const Q_DECL_OVERRIDE;
     QByteArray nextCommandLine(TransactionState *ts) Q_DECL_OVERRIDE;
@@ -226,8 +225,7 @@
 class MailFromCommand : public Command
 {
 public:
-    MailFromCommand(SMTPSessionInterface *smtp, const QByteArray &addr,
-                    bool eightBit = false, unsigned int size = 0)
+    MailFromCommand(SMTPSessionInterface *smtp, const QByteArray &addr, bool eightBit = false, unsigned int size = 0)
         : Command(smtp)
         , mAddr(addr)
         , m8Bit(eightBit)
@@ -328,7 +326,6 @@
 
     QByteArray nextCommandLine(TransactionState *ts) Q_DECL_OVERRIDE;
 };
-
 } // namespace KioSMTP
 
 #endif // __KIOSMTP_COMMAND_H__
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/kioslavesession.h kmailtransport-17.04.3/kioslave/src/smtp/kioslavesession.h
--- kmailtransport-16.12.3/kioslave/src/smtp/kioslavesession.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/kioslavesession.h	2017-06-19 05:09:24.000000000 +0000
@@ -23,9 +23,7 @@
 #include "smtpsessioninterface.h"
 #include "smtp.h"
 
-namespace KioSMTP
-{
-
+namespace KioSMTP {
 class KioSlaveSession : public SMTPSessionInterface
 {
 public:
@@ -46,7 +44,6 @@
 private:
     SMTPProtocol *m_protocol;
 };
-
 }
 
 #endif
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/request.cpp kmailtransport-17.04.3/kioslave/src/smtp/request.cpp
--- kmailtransport-16.12.3/kioslave/src/smtp/request.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/request.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -38,16 +38,14 @@
 
 #include <assert.h>
 
-namespace KioSMTP
-{
-
+namespace KioSMTP {
 Request Request::fromURL(const QUrl &url)
 {
     Request request;
 
     const QStringList query = url.query().split(QLatin1Char('&'));
 #ifndef NDEBUG
-    qCDebug(SMTP_LOG) << "Parsing request from query:\n" << query.join(QStringLiteral("\n"));
+    qCDebug(SMTP_LOG) << "Parsing request from query:\n" << query.join(QLatin1Char('\n'));
 #endif
     for (QStringList::const_iterator it = query.begin(); it != query.end(); ++it) {
         int equalsPos = (*it).indexOf(QLatin1Char('='));
@@ -173,7 +171,7 @@
 QByteArray Request::headerFields(const QString &fromRealName) const
 {
     if (!emitHeaders()) {
-        return 0;
+        return nullptr;
     }
 
     assert(hasFromAddress());   // should have been checked for by
@@ -192,5 +190,4 @@
     }
     return result;
 }
-
 } // namespace KioSMTP
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/request.h kmailtransport-17.04.3/kioslave/src/smtp/request.h
--- kmailtransport-16.12.3/kioslave/src/smtp/request.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/request.h	2017-06-19 05:09:24.000000000 +0000
@@ -37,9 +37,7 @@
 
 class QUrl;
 
-namespace KioSMTP
-{
-
+namespace KioSMTP {
 class Request
 {
 public:
@@ -57,10 +55,12 @@
     {
         return mProfileName;
     }
+
     void setProfileName(const QString &profileName)
     {
         mProfileName = profileName;
     }
+
     bool hasProfile() const
     {
         return !profileName().isNull();
@@ -70,6 +70,7 @@
     {
         return mSubject;
     }
+
     void setSubject(const QString &subject)
     {
         mSubject = subject;
@@ -79,10 +80,12 @@
     {
         return mFromAddress;
     }
+
     void setFromAddress(const QString &fromAddress)
     {
         mFromAddress = fromAddress;
     }
+
     bool hasFromAddress() const
     {
         return !mFromAddress.isEmpty();
@@ -92,6 +95,7 @@
     {
         return to() + cc() + bcc();
     }
+
     bool hasRecipients() const
     {
         return !to().empty() || !cc().empty() || !bcc().empty();
@@ -101,22 +105,27 @@
     {
         return mTo;
     }
+
     QStringList cc() const
     {
         return mCc;
     }
+
     QStringList bcc() const
     {
         return mBcc;
     }
+
     void addTo(const QString &to)
     {
         mTo.push_back(to);
     }
+
     void addCc(const QString &cc)
     {
         mCc.push_back(cc);
     }
+
     void addBcc(const QString &bcc)
     {
         mBcc.push_back(bcc);
@@ -126,6 +135,7 @@
     {
         return mHeloHostname;
     }
+
     QByteArray heloHostnameCString() const;
     void setHeloHostname(const QString &hostname)
     {
@@ -136,6 +146,7 @@
     {
         return mEmitHeaders;
     }
+
     void setEmitHeaders(bool emitHeaders)
     {
         mEmitHeaders = emitHeaders;
@@ -145,6 +156,7 @@
     {
         return m8Bit;
     }
+
     void set8BitBody(bool a8Bit)
     {
         m8Bit = a8Bit;
@@ -154,6 +166,7 @@
     {
         return mSize;
     }
+
     void setSize(unsigned int size)
     {
         mSize = size;
@@ -174,7 +187,6 @@
     bool m8Bit;
     unsigned int mSize;
 };
-
 } // namespace KioSMTP
 
 #endif // __KIOSMTP_REQUEST_H__
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/response.cpp kmailtransport-17.04.3/kioslave/src/smtp/response.cpp
--- kmailtransport-16.12.3/kioslave/src/smtp/response.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/response.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -36,12 +36,9 @@
 
 #include <QByteArray>
 
-namespace KioSMTP
-{
-
+namespace KioSMTP {
 void Response::parseLine(const char *line, int len)
 {
-
     if (!isWellFormed()) {
         return;    // don't bother
     }
@@ -165,5 +162,4 @@
         }
     }
 }
-
 } // namespace KioSMTP
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/response.h kmailtransport-17.04.3/kioslave/src/smtp/response.h
--- kmailtransport-16.12.3/kioslave/src/smtp/response.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/response.h	2017-06-19 05:09:24.000000000 +0000
@@ -38,9 +38,7 @@
 
 class QString;
 
-namespace KioSMTP
-{
-
+namespace KioSMTP {
 class Response
 {
 public:
@@ -56,6 +54,7 @@
     {
         parseLine(line, qstrlen(line));
     }
+
     void parseLine(const char *line, int len);
 
     /** Return an internationalized error message according to the
@@ -85,14 +84,17 @@
     {
         return mCode;
     }
+
     unsigned int first() const
     {
         return code() / 100;
     }
+
     unsigned int second() const
     {
         return (code() % 100) / 10;
     }
+
     unsigned int third() const
     {
         return code() % 10;
@@ -102,10 +104,12 @@
     {
         return first() <= 3 && first() >= 1;
     }
+
     bool isNegative() const
     {
         return first() == 4 || first() == 5;
     }
+
     bool isUnknown() const
     {
         return !isPositive() && !isNegative();
@@ -120,6 +124,7 @@
     {
         return mValid;
     }
+
     bool isComplete() const
     {
         return mSawLastLine;
@@ -152,12 +157,13 @@
 #ifdef KIOSMTP_COMPARATORS
     bool operator==(const Response &other) const
     {
-        return mCode == other.mCode &&
-               mValid == other.mValid &&
-               mSawLastLine == other.mSawLastLine &&
-               mWellFormed == other.mWellFormed &&
-               mLines == other.mLines;
+        return mCode == other.mCode
+               && mValid == other.mValid
+               && mSawLastLine == other.mSawLastLine
+               && mWellFormed == other.mWellFormed
+               && mLines == other.mLines;
     }
+
 #endif
 
 private:
@@ -167,7 +173,6 @@
     bool mSawLastLine;
     bool mWellFormed;
 };
-
 } // namespace KioSMTP
 
 #endif // __KIOSMTP_RESPONSE_H__
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/smtp.cpp kmailtransport-17.04.3/kioslave/src/smtp/smtp.cpp
--- kmailtransport-16.12.3/kioslave/src/smtp/smtp.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/smtp.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -75,7 +75,7 @@
 #include <netdb.h>
 
 extern "C" {
-    Q_DECL_EXPORT int kdemain(int argc, char **argv);
+Q_DECL_EXPORT int kdemain(int argc, char **argv);
 }
 
 int kdemain(int argc, char **argv)
@@ -98,8 +98,7 @@
     return 0;
 }
 
-SMTPProtocol::SMTPProtocol(const QByteArray &pool, const QByteArray &app,
-                           bool useSSL)
+SMTPProtocol::SMTPProtocol(const QByteArray &pool, const QByteArray &app, bool useSSL)
     : TCPSlaveBase(useSSL ? "smtps" : "smtp", pool, app, useSSL)
     , m_sOldPort(0)
     , m_opened(false)
@@ -117,7 +116,6 @@
 
 void SMTPProtocol::openConnection()
 {
-
     // Don't actually call smtp_open() yet. Just pretend that we are connected.
     // We can't call smtp_open() here, as that does EHLO, and the EHLO command
     // needs the fake hostname. However, we only get the fake hostname in put(), so
@@ -137,8 +135,8 @@
     s >> what;
     if (what == 'c') {
         const QString response = m_sessionIface->capabilities().createSpecialResponse(
-                                     (isUsingSsl() && !isAutoSsl())
-                                     || m_sessionIface->haveCapability("STARTTLS"));
+            (isUsingSsl() && !isAutoSsl())
+            || m_sessionIface->haveCapability("STARTTLS"));
         infoMessage(response);
     } else if (what == 'N') {
         if (!execute(Command::NOOP)) {
@@ -220,7 +218,7 @@
     }
 
     if (request.is8BitBody()
-            && !m_sessionIface->haveCapability("8BITMIME") && !m_sessionIface->eightBitMimeRequested()) {
+        && !m_sessionIface->haveCapability("8BITMIME") && !m_sessionIface->eightBitMimeRequested()) {
         error(KIO::ERR_SERVICE_NOT_AVAILABLE,
               i18n("Your server (%1) does not support sending of 8-bit messages.\n"
                    "Please use base64 or quoted-printable encoding.", m_sServer));
@@ -250,8 +248,7 @@
     }
 }
 
-void SMTPProtocol::setHost(const QString &host, quint16 port,
-                           const QString &user, const QString &pass)
+void SMTPProtocol::setHost(const QString &host, quint16 port, const QString &user, const QString &pass)
 {
     m_sServer = host;
     m_port = port;
@@ -280,7 +277,6 @@
 
 Response SMTPProtocol::getResponse(bool *ok)
 {
-
     if (ok) {
         *ok = false;
     }
@@ -343,9 +339,9 @@
         if (cmdline.isEmpty()) {
             continue;
         }
-        if (!sendCommandLine(cmdline) ||
-                !batchProcessResponses(ts) ||
-                ts->failedFatally()) {
+        if (!sendCommandLine(cmdline)
+            || !batchProcessResponses(ts)
+            || ts->failedFatally()) {
             smtp_close(false);   // _hard_ shutdown
             return false;
         }
@@ -368,7 +364,6 @@
     unsigned int cmdLine_len = 0;
 
     while (!mPendingCommandQueue.isEmpty()) {
-
         Command *cmd = mPendingCommandQueue.head();
 
         if (cmd->doNotExecute(ts)) {
@@ -410,8 +405,8 @@
             //
             // 32 KB seems to be a sensible limit. Additionally, a job can only transfer
             // 32 KB at once anyway.
-            if (dynamic_cast<TransferCommand *>(cmd) != 0 &&
-                    cmdLine_len >= 32 * 1024) {
+            if (dynamic_cast<TransferCommand *>(cmd) != nullptr
+                && cmdLine_len >= 32 * 1024) {
                 return cmdLine;
             }
         }
@@ -431,7 +426,6 @@
     assert(ts);
 
     while (!mSentCommandQueue.isEmpty()) {
-
         Command *cmd = mSentCommandQueue.head();
         assert(cmd->isComplete());
 
@@ -469,7 +463,6 @@
 // ### when command queues are _not_ empty!)
 bool SMTPProtocol::execute(Command *cmd, TransactionState *ts)
 {
-
     if (!cmd) {
         qCritical() << "SMTPProtocol::execute() called with no command to run!";
     }
@@ -508,9 +501,9 @@
             return false;
         }
         if (!cmd->processResponse(r, ts)) {
-            if ((ts && ts->failedFatally()) ||
-                    cmd->closeConnectionOnError() ||
-                    !execute(Command::RSET)) {
+            if ((ts && ts->failedFatally())
+                || cmd->closeConnectionOnError()
+                || !execute(Command::RSET)) {
                 smtp_close(false);
             }
             return false;
@@ -522,11 +515,11 @@
 
 bool SMTPProtocol::smtp_open(const QString &fakeHostname)
 {
-    if (m_opened &&
-            m_sOldPort == m_port &&
-            m_sOldServer == m_sServer &&
-            m_sOldUser == m_sUser &&
-            (fakeHostname.isNull() || m_hostname == fakeHostname)) {
+    if (m_opened
+        && m_sOldPort == m_port
+        && m_sOldServer == m_sServer
+        && m_sOldUser == m_sUser
+        && (fakeHostname.isNull() || m_hostname == fakeHostname)) {
         return true;
     }
 
@@ -542,7 +535,7 @@
         if (ok) {
             error(KIO::ERR_COULD_NOT_LOGIN,
                   i18n("The server (%1) did not accept the connection.\n"
-                       "%2", m_sServer,  greeting.errorMessage()));
+                       "%2", m_sServer, greeting.errorMessage()));
         }
         smtp_close();
         return false;
@@ -567,11 +560,10 @@
     }
 
     if ((m_sessionIface->haveCapability("STARTTLS") /*### && canUseTLS()*/ && m_sessionIface->tlsRequested() != SMTPSessionInterface::ForceNoTLS)
-            || m_sessionIface->tlsRequested() == SMTPSessionInterface::ForceTLS) {
+        || m_sessionIface->tlsRequested() == SMTPSessionInterface::ForceTLS) {
         // For now we're gonna force it on.
 
         if (execute(Command::STARTTLS)) {
-
             // re-issue EHLO to refresh the capability list (could be have
             // been faked before TLS was enabled):
             EHLOCommand ehloCmdPostTLS(m_sessionIface, m_hostname);
@@ -599,8 +591,8 @@
 {
     // return with success if the server doesn't support SMTP-AUTH or an user
     // name is not specified and metadata doesn't tell us to force it.
-    if ((m_sUser.isEmpty() || !m_sessionIface->haveCapability("AUTH")) &&
-            m_sessionIface->requestedSaslMethod().isEmpty()) {
+    if ((m_sUser.isEmpty() || !m_sessionIface->haveCapability("AUTH"))
+        && m_sessionIface->requestedSaslMethod().isEmpty()) {
         return true;
     }
 
@@ -617,7 +609,7 @@
         strList = m_sessionIface->capabilities().saslMethodsQSL();
     }
 
-    const QByteArray ba = strList.join(QStringLiteral(" ")).toLatin1();
+    const QByteArray ba = strList.join(QLatin1Char(' ')).toLatin1();
     AuthCommand authCmd(m_sessionIface, ba.constData(), m_sServer, authInfo);
     bool ret = execute(&authCmd);
     m_sUser = authInfo.username;
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/smtp.h kmailtransport-17.04.3/kioslave/src/smtp/smtp.h
--- kmailtransport-16.12.3/kioslave/src/smtp/smtp.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/smtp.h	2017-06-19 05:09:24.000000000 +0000
@@ -38,8 +38,7 @@
 
 class QUrl;
 
-namespace KioSMTP
-{
+namespace KioSMTP {
 class Response;
 class TransactionState;
 class Command;
@@ -52,10 +51,9 @@
     friend class KioSMTP::KioSlaveSession;
 public:
     SMTPProtocol(const QByteArray &pool, const QByteArray &app, bool useSSL);
-    virtual ~ SMTPProtocol();
+    virtual ~SMTPProtocol();
 
-    virtual void setHost(const QString &host, quint16 port,
-                         const QString &user, const QString &pass) Q_DECL_OVERRIDE;
+    virtual void setHost(const QString &host, quint16 port, const QString &user, const QString &pass) Q_DECL_OVERRIDE;
 
     void special(const QByteArray &aData) Q_DECL_OVERRIDE;
     void put(const QUrl &url, int permissions, KIO::JobFlags flags) Q_DECL_OVERRIDE;
@@ -107,9 +105,10 @@
     {
         mPendingCommandQueue.enqueue(command);
     }
+
     void queueCommand(int type);
 
-    quint16  m_sOldPort;
+    quint16 m_sOldPort;
     quint16 m_port;
     bool m_opened;
     QString m_sServer, m_sOldServer;
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/smtpsessioninterface.h kmailtransport-17.04.3/kioslave/src/smtp/smtpsessioninterface.h
--- kmailtransport-16.12.3/kioslave/src/smtp/smtpsessioninterface.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/smtpsessioninterface.h	2017-06-19 05:09:24.000000000 +0000
@@ -25,14 +25,11 @@
 class QByteArray;
 class QString;
 
-namespace KIO
-{
+namespace KIO {
 class AuthInfo;
 }
 
-namespace KioSMTP
-{
-
+namespace KioSMTP {
 class Response;
 
 /** Interface to the SMTP session for command classes.
@@ -87,10 +84,9 @@
     /** Pipelining has been requested. */
     virtual bool pipeliningRequested() const;
 
-private :
+private:
     KioSMTP::Capabilities m_capabilities;
 };
-
 }
 
 #endif
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/tests/fakesession.h kmailtransport-17.04.3/kioslave/src/smtp/tests/fakesession.h
--- kmailtransport-16.12.3/kioslave/src/smtp/tests/fakesession.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/tests/fakesession.h	2017-06-19 05:09:24.000000000 +0000
@@ -25,9 +25,7 @@
 #include <QStringList>
 #include <kio/slavebase.h>
 
-namespace KioSMTP
-{
-
+namespace KioSMTP {
 class FakeSession : public SMTPSessionInterface
 {
 public:
@@ -71,29 +69,41 @@
     //
     // emulated API:
     //
-    bool startSsl() Q_DECL_OVERRIDE {
+    bool startSsl() Q_DECL_OVERRIDE
+    {
         return startTLSReturnCode;
     }
+
     bool haveCapability(const char *cap) const Q_DECL_OVERRIDE
     {
         return caps.contains(QLatin1String(cap));
     }
-    void error(int id, const QString &msg) Q_DECL_OVERRIDE {
+
+    void error(int id, const QString &msg) Q_DECL_OVERRIDE
+    {
         lastErrorCode = id;
         lastErrorMessage = msg;
         qWarning() << id << msg;
     }
-    void informationMessageBox(const QString &msg, const QString &caption) Q_DECL_OVERRIDE {
+
+    void informationMessageBox(const QString &msg, const QString &caption) Q_DECL_OVERRIDE
+    {
         Q_UNUSED(caption);
         lastMessageBoxText = msg;
     }
-    bool openPasswordDialog(KIO::AuthInfo &) Q_DECL_OVERRIDE {
+
+    bool openPasswordDialog(KIO::AuthInfo &) Q_DECL_OVERRIDE
+    {
         return true;
     }
-    void dataReq() Q_DECL_OVERRIDE {
+
+    void dataReq() Q_DECL_OVERRIDE
+    {
         /* noop */
     }
-    int readData(QByteArray &ba) Q_DECL_OVERRIDE {
+
+    int readData(QByteArray &ba) Q_DECL_OVERRIDE
+    {
         ba = nextData;
         return nextDataReturnCode;
     }
@@ -102,16 +112,17 @@
     {
         return lf2crlfAndDotStuff;
     }
+
     QString requestedSaslMethod() const Q_DECL_OVERRIDE
     {
         return saslMethod;
     }
+
     TLSRequestState tlsRequested() const Q_DECL_OVERRIDE
     {
         return SMTPSessionInterface::UseTLSIfAvailable;
     }
 };
-
 }
 
 #include "smtpsessioninterface.cpp"
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/tests/interactivesmtpserver.cpp kmailtransport-17.04.3/kioslave/src/smtp/tests/interactivesmtpserver.cpp
--- kmailtransport-16.12.3/kioslave/src/smtp/tests/interactivesmtpserver.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/tests/interactivesmtpserver.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -6,18 +6,20 @@
     This file is part of the testsuite of kio_smtp, the KDE SMTP kioslave.
     Copyright (c) 2004 Marc Mutz <mutz@kde.org>
 
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License, version 2, as
-    published by the Free Software Foundation.
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
 
     This program is distributed in the hope that it will be useful, but
     WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
@@ -50,9 +52,12 @@
 static QString err2str(QAbstractSocket::SocketError error)
 {
     switch (error) {
-    case QAbstractSocket::ConnectionRefusedError: return QStringLiteral("Connection refused");
-    case QAbstractSocket::HostNotFoundError: return QStringLiteral("Host not found");
-    default: return QStringLiteral("Unknown error");
+    case QAbstractSocket::ConnectionRefusedError:
+        return QStringLiteral("Connection refused");
+    case QAbstractSocket::HostNotFoundError:
+        return QStringLiteral("Host not found");
+    default:
+        return QStringLiteral("Unknown error");
     }
 }
 
@@ -63,7 +68,7 @@
            .replace(QLatin1Char('>'), QLatin1String("&gt;"))
            .replace(QLatin1Char('<'), QLatin1String("&lt;"))
            .replace(QLatin1Char('"'), QLatin1String("&quot;"))
-           ;
+    ;
 }
 
 static QString trim(const QString &s)
@@ -81,13 +86,13 @@
 {
     if (mSocket) {
         mSocket->close();
-        if (mSocket->state() == QAbstractSocket::ClosingState)
+        if (mSocket->state() == QAbstractSocket::ClosingState) {
             connect(mSocket, SIGNAL(disconnected()),
                     mSocket, SLOT(deleteLater()));
-        else {
+        } else {
             mSocket->deleteLater();
         }
-        mSocket = 0;
+        mSocket = nullptr;
     }
 }
 
@@ -128,7 +133,8 @@
 }
 
 InteractiveSMTPServerWindow::InteractiveSMTPServerWindow(QTcpSocket *socket, QWidget *parent)
-    : QWidget(parent), mSocket(socket)
+    : QWidget(parent)
+    , mSocket(socket)
 {
     QPushButton *but;
     Q_ASSERT(socket);
@@ -203,4 +209,3 @@
 {
     mSocket->close();
 }
-
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/tests/interactivesmtpserver.h kmailtransport-17.04.3/kioslave/src/smtp/tests/interactivesmtpserver.h
--- kmailtransport-16.12.3/kioslave/src/smtp/tests/interactivesmtpserver.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/tests/interactivesmtpserver.h	2017-06-19 05:09:24.000000000 +0000
@@ -9,18 +9,20 @@
     This file is part of the testsuite of kio_smtp, the KDE SMTP kioslave.
     Copyright (c) 2004 Marc Mutz <mutz@kde.org>
 
-    This program is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License, version 2, as
-    published by the Free Software Foundation.
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
 
     This program is distributed in the hope that it will be useful, but
     WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
 
     In addition, as a special exception, the copyright holders give
     permission to link the code of this program with any edition of
@@ -46,7 +48,7 @@
 {
     Q_OBJECT
 public:
-    InteractiveSMTPServerWindow(QTcpSocket *socket, QWidget *parent = Q_NULLPTR);
+    InteractiveSMTPServerWindow(QTcpSocket *socket, QWidget *parent = nullptr);
     ~InteractiveSMTPServerWindow();
 
 public Q_SLOTS:
@@ -71,8 +73,10 @@
     Q_OBJECT
 
 public:
-    InteractiveSMTPServer(QObject *parent = Q_NULLPTR);
-    ~InteractiveSMTPServer() {}
+    InteractiveSMTPServer(QObject *parent = nullptr);
+    ~InteractiveSMTPServer()
+    {
+    }
 
 private Q_SLOTS:
     void newConnectionAvailable();
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/tests/requesttest.cpp kmailtransport-17.04.3/kioslave/src/smtp/tests/requesttest.cpp
--- kmailtransport-16.12.3/kioslave/src/smtp/tests/requesttest.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/tests/requesttest.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -1,18 +1,20 @@
 /*
-  Copyright (c) 2014 Montel Laurent <montel@kde.org>
+  Copyright (c) 2014-2017 Montel Laurent <montel@kde.org>
 
-  This program is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License, version 2, as
-  published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
 */
 #include "requesttest.h"
 #include "../request.h"
@@ -21,12 +23,10 @@
 RequestTest::RequestTest(QObject *parent)
     : QObject(parent)
 {
-
 }
 
 RequestTest::~RequestTest()
 {
-
 }
 
 void RequestTest::shouldHaveDefaultValue()
@@ -72,10 +72,10 @@
     QFETCH(unsigned int, size);
 
     KioSMTP::Request request = KioSMTP::Request::fromURL(smtpurl);
-    QCOMPARE(request.to().join(QLatin1String(",")), to);
-    QCOMPARE(request.cc().join(QLatin1String(",")), cc);
+    QCOMPARE(request.to().join(QLatin1Char(',')), to);
+    QCOMPARE(request.cc().join(QLatin1Char(',')), cc);
     QCOMPARE(request.fromAddress(), from);
-    QCOMPARE(request.bcc().join(QLatin1String(",")), bcc);
+    QCOMPARE(request.bcc().join(QLatin1Char(',')), bcc);
     QCOMPARE(request.size(), size);
     QCOMPARE(request.emitHeaders(), emitheaders);
 }
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/tests/requesttest.h kmailtransport-17.04.3/kioslave/src/smtp/tests/requesttest.h
--- kmailtransport-16.12.3/kioslave/src/smtp/tests/requesttest.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/tests/requesttest.h	2017-06-19 05:09:24.000000000 +0000
@@ -1,18 +1,20 @@
 /*
-  Copyright (c) 2014 Montel Laurent <montel@kde.org>
+  Copyright (c) 2014-2017 Montel Laurent <montel@kde.org>
 
-  This program is free software; you can redistribute it and/or modify it
-  under the terms of the GNU General Public License, version 2, as
-  published by the Free Software Foundation.
-
-  This program is distributed in the hope that it will be useful, but
-  WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-  General Public License for more details.
-
-  You should have received a copy of the GNU General Public License along
-  with this program; if not, write to the Free Software Foundation, Inc.,
-  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
 */
 
 #ifndef REQUESTTEST_H
@@ -24,7 +26,7 @@
 {
     Q_OBJECT
 public:
-    explicit RequestTest(QObject *parent = Q_NULLPTR);
+    explicit RequestTest(QObject *parent = nullptr);
     ~RequestTest();
 private Q_SLOTS:
     void shouldHaveDefaultValue();
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/tests/test_commands.cpp kmailtransport-17.04.3/kioslave/src/smtp/tests/test_commands.cpp
--- kmailtransport-16.12.3/kioslave/src/smtp/tests/test_commands.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/tests/test_commands.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -29,7 +29,6 @@
 
 int main(int, char **)
 {
-
     if (!initSASL()) {
         exit(-1);
     }
@@ -51,18 +50,18 @@
 
     // initial state
     assert(!ehlo.isComplete());
-    assert(!ehlo.doNotExecute(0));
+    assert(!ehlo.doNotExecute(nullptr));
     assert(!ehlo.needsResponse());
 
     // dynamics 1: EHLO succeeds
-    assert(ehlo.nextCommandLine(0) == "EHLO mail.example.com\r\n");
+    assert(ehlo.nextCommandLine(nullptr) == "EHLO mail.example.com\r\n");
     assert(!ehlo.isComplete());   // EHLO may fail and we then try HELO
     assert(ehlo.needsResponse());
     r.clear();
     r.parseLine("250-mail.example.net\r\n");
     r.parseLine("250-PIPELINING\r\n");
     r.parseLine("250 8BITMIME\r\n");
-    assert(ehlo.processResponse(r, 0) == true);
+    assert(ehlo.processResponse(r, nullptr) == true);
     assert(ehlo.isComplete());
     assert(!ehlo.needsResponse());
     assert(smtp.lastErrorCode == 0);
@@ -71,18 +70,18 @@
     // dynamics 2: EHLO fails with "unknown command"
     smtp.clear();
     EHLOCommand ehlo2(&smtp, QStringLiteral("mail.example.com"));
-    ehlo2.nextCommandLine(0);
+    ehlo2.nextCommandLine(nullptr);
     r.clear();
     r.parseLine("500 unknown command\r\n");
-    assert(ehlo2.processResponse(r, 0) == true);
+    assert(ehlo2.processResponse(r, nullptr) == true);
     assert(!ehlo2.isComplete());
     assert(!ehlo2.needsResponse());
-    assert(ehlo2.nextCommandLine(0) == "HELO mail.example.com\r\n");
+    assert(ehlo2.nextCommandLine(nullptr) == "HELO mail.example.com\r\n");
     assert(ehlo2.isComplete());
     assert(ehlo2.needsResponse());
     r.clear();
     r.parseLine("250 mail.example.net\r\n");
-    assert(ehlo2.processResponse(r, 0) == true);
+    assert(ehlo2.processResponse(r, nullptr) == true);
     assert(!ehlo2.needsResponse());
     assert(smtp.lastErrorCode == 0);
     assert(smtp.lastErrorMessage.isNull());
@@ -90,10 +89,10 @@
     // dynamics 3: EHLO fails with unknown response code
     smtp.clear();
     EHLOCommand ehlo3(&smtp, QStringLiteral("mail.example.com"));
-    ehlo3.nextCommandLine(0);
+    ehlo3.nextCommandLine(nullptr);
     r.clear();
     r.parseLine("545 you don't know me\r\n");
-    assert(ehlo3.processResponse(r, 0) == false);
+    assert(ehlo3.processResponse(r, nullptr) == false);
     assert(ehlo3.isComplete());
     assert(!ehlo3.needsResponse());
     assert(smtp.lastErrorCode == KIO::ERR_UNKNOWN);
@@ -101,14 +100,14 @@
     // dynamics 4: EHLO _and_ HELO fail with "command unknown"
     smtp.clear();
     EHLOCommand ehlo4(&smtp, QStringLiteral("mail.example.com"));
-    ehlo4.nextCommandLine(0);
+    ehlo4.nextCommandLine(nullptr);
     r.clear();
     r.parseLine("500 unknown command\r\n");
-    ehlo4.processResponse(r, 0);
-    ehlo4.nextCommandLine(0);
+    ehlo4.processResponse(r, nullptr);
+    ehlo4.nextCommandLine(nullptr);
     r.clear();
     r.parseLine("500 unknown command\r\n");
-    assert(ehlo4.processResponse(r, 0) == false);
+    assert(ehlo4.processResponse(r, nullptr) == false);
     assert(ehlo4.isComplete());
     assert(!ehlo4.needsResponse());
     assert(smtp.lastErrorCode == KIO::ERR_INTERNAL_SERVER);
@@ -126,7 +125,7 @@
 
     // initial state
     assert(!tls.isComplete());
-    assert(!tls.doNotExecute(0));
+    assert(!tls.doNotExecute(nullptr));
     assert(!tls.needsResponse());
 
     // dynamics 1: ok from server, TLS negotiation successful
@@ -185,7 +184,7 @@
 
     // initial state
     assert(!auth.isComplete());
-    assert(!auth.doNotExecute(0));
+    assert(!auth.doNotExecute(nullptr));
     assert(!auth.needsResponse());
 
     // dynamics 1: TLS, so AUTH should include initial-response:
@@ -267,7 +266,7 @@
 
     // initial state
     assert(!mail.isComplete());
-    assert(!mail.doNotExecute(0));
+    assert(!mail.doNotExecute(nullptr));
     assert(!mail.needsResponse());
 
     // dynamics: success, no size, no 8bit
@@ -328,7 +327,7 @@
 
     // initial state
     assert(!rcpt.isComplete());
-    assert(!rcpt.doNotExecute(0));
+    assert(!rcpt.doNotExecute(nullptr));
     assert(!rcpt.needsResponse());
 
     // dynamics: success
@@ -404,7 +403,7 @@
 
     // initial state
     assert(!data.isComplete());
-    assert(!data.doNotExecute(0));
+    assert(!data.doNotExecute(nullptr));
     assert(!data.needsResponse());
 
     // dynamics: success
@@ -439,7 +438,7 @@
     // DATA (transfer)
     //
 
-    TransferCommand xfer(&smtp, 0);
+    TransferCommand xfer(&smtp, nullptr);
     // flags
     assert(!xfer.closeConnectionOnError());
     assert(!xfer.mustBeLastInPipeline());
@@ -459,7 +458,7 @@
 
     // dynamics 2: some recipients rejected, but not all
     smtp.clear();
-    TransferCommand xfer2(&smtp, 0);
+    TransferCommand xfer2(&smtp, nullptr);
     ts.clear();
     ts.setRecipientAccepted();
     ts.addRejectedRecipient(QStringLiteral("joe@user.org"), QStringLiteral("No relaying allowed"));
@@ -479,9 +478,10 @@
         Error = 16,
         EndOfOptions = 32
     };
-    for (unsigned int i = 0; i < EndOfOptions; ++i)
+    for (unsigned int i = 0; i < EndOfOptions; ++i) {
         checkSuccessfulTransferCommand(i & Error, i & Preloading, i & UngetLast,
                                        i & PerformDotStuff, i & EndInLF);
+    }
 
     //
     // NOOP
@@ -500,12 +500,12 @@
     assert(!noop.needsResponse());
 
     // dynamics: success (failure is tested with RSET)
-    assert(noop.nextCommandLine(0) == "NOOP\r\n");
+    assert(noop.nextCommandLine(nullptr) == "NOOP\r\n");
     assert(noop.isComplete());
     assert(noop.needsResponse());
     r.clear();
     r.parseLine("250 Ok");
-    assert(noop.processResponse(r, 0) == true);
+    assert(noop.processResponse(r, nullptr) == true);
     assert(noop.isComplete());
     assert(!noop.needsResponse());
     assert(smtp.lastErrorCode == 0);
@@ -528,12 +528,12 @@
     assert(!rset.needsResponse());
 
     // dynamics: failure (success is tested with NOOP/QUIT)
-    assert(rset.nextCommandLine(0) == "RSET\r\n");
+    assert(rset.nextCommandLine(nullptr) == "RSET\r\n");
     assert(rset.isComplete());
     assert(rset.needsResponse());
     r.clear();
     r.parseLine("502 command not implemented");
-    assert(rset.processResponse(r, 0) == false);
+    assert(rset.processResponse(r, nullptr) == false);
     assert(rset.isComplete());
     assert(!rset.needsResponse());
     assert(smtp.lastErrorCode == 0);   // an RSET failure isn't worth it, is it?
@@ -552,16 +552,16 @@
 
     // initial state
     assert(!quit.isComplete());
-    assert(!quit.doNotExecute(0));
+    assert(!quit.doNotExecute(nullptr));
     assert(!quit.needsResponse());
 
     // dynamics 1: success
-    assert(quit.nextCommandLine(0) == "QUIT\r\n");
+    assert(quit.nextCommandLine(nullptr) == "QUIT\r\n");
     assert(quit.isComplete());
     assert(quit.needsResponse());
     r.clear();
     r.parseLine("221 Goodbye");
-    assert(quit.processResponse(r, 0) == true);
+    assert(quit.processResponse(r, nullptr) == true);
     assert(quit.isComplete());
     assert(!quit.needsResponse());
     assert(smtp.lastErrorCode == 0);
@@ -570,10 +570,10 @@
     // dynamics 2: success
     smtp.clear();
     QuitCommand quit2(&smtp);
-    quit2.nextCommandLine(0);
+    quit2.nextCommandLine(nullptr);
     r.clear();
     r.parseLine("500 unknown command");
-    assert(quit2.processResponse(r, 0) == false);
+    assert(quit2.processResponse(r, nullptr) == false);
     assert(quit2.isComplete());
     assert(!quit2.needsResponse());
     assert(smtp.lastErrorCode == 0);   // an QUIT failure isn't worth it, is it?
@@ -582,8 +582,7 @@
     return 0;
 }
 
-void checkSuccessfulTransferCommand(bool error, bool preload, bool ungetLast,
-                                    bool slaveDotStuff, bool mailEndsInNewline)
+void checkSuccessfulTransferCommand(bool error, bool preload, bool ungetLast, bool slaveDotStuff, bool mailEndsInNewline)
 {
     qDebug() << "   ===== checkTransferCommand( "
              << error << ", "
@@ -599,8 +598,8 @@
 
     Response r;
 
-    const char *s_pre = slaveDotStuff ?
-                        mailEndsInNewline ? foobarbaz_lf : foobarbaz
+    const char *s_pre = slaveDotStuff
+                        ? mailEndsInNewline ? foobarbaz_lf : foobarbaz
                         :
                         mailEndsInNewline ? foobarbaz_crlf : foobarbaz_dotstuffed;
     const unsigned int s_pre_len = qstrlen(s_pre);
@@ -608,7 +607,7 @@
     const char *s_post = mailEndsInNewline ? foobarbaz_crlf : foobarbaz_dotstuffed;
     //const unsigned int s_post_len = qstrlen( s_post );
 
-    TransferCommand xfer(&smtp, preload ? s_post : 0);
+    TransferCommand xfer(&smtp, preload ? s_post : nullptr);
 
     TransactionState ts;
     ts.setRecipientAccepted();
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/tests/test_headergeneration.cpp kmailtransport-17.04.3/kioslave/src/smtp/tests/test_headergeneration.cpp
--- kmailtransport-16.12.3/kioslave/src/smtp/tests/test_headergeneration.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/tests/test_headergeneration.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -7,55 +7,55 @@
 
 int main(int, char **)
 {
-    static QByteArray expected =
-        "From: mutz@kde.org\r\n"
-        "Subject: missing subject\r\n"
-        "To: joe@user.org,\r\n"
-        "\tvalentine@14th.february.org\r\n"
-        "Cc: boss@example.com\r\n"
-        "\n"
-        "From: Marc Mutz <mutz@kde.org>\r\n"
-        "Subject: missing subject\r\n"
-        "To: joe@user.org,\r\n"
-        "\tvalentine@14th.february.org\r\n"
-        "Cc: boss@example.com\r\n"
-        "\n"
-        "From: \"Mutz, Marc\" <mutz@kde.org>\r\n"
-        "Subject: missing subject\r\n"
-        "To: joe@user.org,\r\n"
-        "\tvalentine@14th.february.org\r\n"
-        "Cc: boss@example.com\r\n"
-        "\n"
-        "From: =?utf-8?b?TWFyYyBNw7Z0eg==?= <mutz@kde.org>\r\n"
-        "Subject: missing subject\r\n"
-        "To: joe@user.org,\r\n"
-        "\tvalentine@14th.february.org\r\n"
-        "Cc: boss@example.com\r\n"
-        "\n"
-        "From: mutz@kde.org\r\n"
-        "Subject: =?utf-8?b?QmzDtmRlcyBTdWJqZWN0?=\r\n"
-        "To: joe@user.org,\r\n"
-        "\tvalentine@14th.february.org\r\n"
-        "Cc: boss@example.com\r\n"
-        "\n"
-        "From: Marc Mutz <mutz@kde.org>\r\n"
-        "Subject: =?utf-8?b?QmzDtmRlcyBTdWJqZWN0?=\r\n"
-        "To: joe@user.org,\r\n"
-        "\tvalentine@14th.february.org\r\n"
-        "Cc: boss@example.com\r\n"
-        "\n"
-        "From: \"Mutz, Marc\" <mutz@kde.org>\r\n"
-        "Subject: =?utf-8?b?QmzDtmRlcyBTdWJqZWN0?=\r\n"
-        "To: joe@user.org,\r\n"
-        "\tvalentine@14th.february.org\r\n"
-        "Cc: boss@example.com\r\n"
-        "\n"
-        "From: =?utf-8?b?TWFyYyBNw7Z0eg==?= <mutz@kde.org>\r\n"
-        "Subject: =?utf-8?b?QmzDtmRlcyBTdWJqZWN0?=\r\n"
-        "To: joe@user.org,\r\n"
-        "\tvalentine@14th.february.org\r\n"
-        "Cc: boss@example.com\r\n"
-        "\n";
+    static QByteArray expected
+        = "From: mutz@kde.org\r\n"
+          "Subject: missing subject\r\n"
+          "To: joe@user.org,\r\n"
+          "\tvalentine@14th.february.org\r\n"
+          "Cc: boss@example.com\r\n"
+          "\n"
+          "From: Marc Mutz <mutz@kde.org>\r\n"
+          "Subject: missing subject\r\n"
+          "To: joe@user.org,\r\n"
+          "\tvalentine@14th.february.org\r\n"
+          "Cc: boss@example.com\r\n"
+          "\n"
+          "From: \"Mutz, Marc\" <mutz@kde.org>\r\n"
+          "Subject: missing subject\r\n"
+          "To: joe@user.org,\r\n"
+          "\tvalentine@14th.february.org\r\n"
+          "Cc: boss@example.com\r\n"
+          "\n"
+          "From: =?utf-8?b?TWFyYyBNw7Z0eg==?= <mutz@kde.org>\r\n"
+          "Subject: missing subject\r\n"
+          "To: joe@user.org,\r\n"
+          "\tvalentine@14th.february.org\r\n"
+          "Cc: boss@example.com\r\n"
+          "\n"
+          "From: mutz@kde.org\r\n"
+          "Subject: =?utf-8?b?QmzDtmRlcyBTdWJqZWN0?=\r\n"
+          "To: joe@user.org,\r\n"
+          "\tvalentine@14th.february.org\r\n"
+          "Cc: boss@example.com\r\n"
+          "\n"
+          "From: Marc Mutz <mutz@kde.org>\r\n"
+          "Subject: =?utf-8?b?QmzDtmRlcyBTdWJqZWN0?=\r\n"
+          "To: joe@user.org,\r\n"
+          "\tvalentine@14th.february.org\r\n"
+          "Cc: boss@example.com\r\n"
+          "\n"
+          "From: \"Mutz, Marc\" <mutz@kde.org>\r\n"
+          "Subject: =?utf-8?b?QmzDtmRlcyBTdWJqZWN0?=\r\n"
+          "To: joe@user.org,\r\n"
+          "\tvalentine@14th.february.org\r\n"
+          "Cc: boss@example.com\r\n"
+          "\n"
+          "From: =?utf-8?b?TWFyYyBNw7Z0eg==?= <mutz@kde.org>\r\n"
+          "Subject: =?utf-8?b?QmzDtmRlcyBTdWJqZWN0?=\r\n"
+          "To: joe@user.org,\r\n"
+          "\tvalentine@14th.february.org\r\n"
+          "Cc: boss@example.com\r\n"
+          "\n";
 
     KioSMTP::Request request;
     QByteArray result;
@@ -87,4 +87,3 @@
 }
 
 #include "../request.cpp"
-
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/tests/test_responseparser.cpp kmailtransport-17.04.3/kioslave/src/smtp/tests/test_responseparser.cpp
--- kmailtransport-16.12.3/kioslave/src/smtp/tests/test_responseparser.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/tests/test_responseparser.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -7,7 +7,7 @@
 QTEST_GUILESS_MAIN(ResponseParserTest)
 
 static const QByteArray singleLineResponseCRLF = "250 OK\r\n";
-static const QByteArray singleLineResponse     = "250 OK";
+static const QByteArray singleLineResponse = "250 OK";
 
 static const QByteArray multiLineResponse[] = {
     "250-ktown.kde.org\r\n",
@@ -15,7 +15,7 @@
     "250-AUTH PLAIN DIGEST-MD5\r\n",
     "250 PIPELINING\r\n"
 };
-static const unsigned int numMultiLineLines = sizeof multiLineResponse / sizeof * multiLineResponse;
+static const unsigned int numMultiLineLines = sizeof multiLineResponse / sizeof *multiLineResponse;
 
 void ResponseParserTest::testResponseParser()
 {
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/transactionstate.cpp kmailtransport-17.04.3/kioslave/src/smtp/transactionstate.cpp
--- kmailtransport-16.12.3/kioslave/src/smtp/transactionstate.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/transactionstate.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -34,9 +34,7 @@
 #include <kio/global.h>
 #include <KLocalizedString>
 
-namespace KioSMTP
-{
-
+namespace KioSMTP {
 void TransactionState::setFailedFatally(int code, const QString &msg)
 {
     mFailed = mFailedFatally = true;
@@ -50,10 +48,10 @@
     mErrorCode = KIO::ERR_NO_CONTENT;
     if (addr.isEmpty()) {
         mErrorMessage = i18n("The server did not accept a blank sender address.\n"
-                             "%1",  r.errorMessage());
+                             "%1", r.errorMessage());
     } else {
         mErrorMessage = i18n("The server did not accept the sender address \"%1\".\n"
-                             "%2",  addr,  r.errorMessage());
+                             "%2", addr, r.errorMessage());
     }
 }
 
@@ -108,11 +106,11 @@
         QStringList recip;
         recip.reserve(mRejectedRecipients.count());
         for (RejectedRecipientList::const_iterator it = mRejectedRecipients.begin();
-                it != mRejectedRecipients.end(); ++it) {
+             it != mRejectedRecipients.end(); ++it) {
             recip.push_back((*it).recipient + QLatin1String(" (") + (*it).reason + QLatin1Char(')'));
         }
         return i18n("Message sending failed since the following recipients were rejected by the server:\n"
-                    "%1", recip.join(QStringLiteral("\n")));
+                    "%1", recip.join(QLatin1Char('\n')));
     }
 
     if (!dataCommandSucceeded()) {
@@ -123,5 +121,4 @@
     // ### what else?
     return i18n("Unhandled error condition. Please send a bug report.");
 }
-
 }
diff -Nru kmailtransport-16.12.3/kioslave/src/smtp/transactionstate.h kmailtransport-17.04.3/kioslave/src/smtp/transactionstate.h
--- kmailtransport-16.12.3/kioslave/src/smtp/transactionstate.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kioslave/src/smtp/transactionstate.h	2017-06-19 05:09:24.000000000 +0000
@@ -36,9 +36,7 @@
 
 #include <QString>
 
-namespace KioSMTP
-{
-
+namespace KioSMTP {
 /**
    @short A class modelling an SMTP transaction's state
 
@@ -64,12 +62,12 @@
 {
 public:
     struct RecipientRejection {
-        RecipientRejection(const QString &who = QString(),
-                           const QString &why = QString())
+        RecipientRejection(const QString &who = QString(), const QString &why = QString())
             : recipient(who)
             , reason(why)
         {
         }
+
         QString recipient;
         QString reason;
 #ifdef KIOSMTP_COMPARATORS
@@ -77,6 +75,7 @@
         {
             return recipient == other.recipient && reason == other.reason;
         }
+
 #endif
     };
     typedef QList<RecipientRejection> RejectedRecipientList;
@@ -102,6 +101,7 @@
     {
         return mFailed || mFailedFatally;
     }
+
     void setFailed()
     {
         mFailed = true;
@@ -116,6 +116,7 @@
     {
         return mFailedFatally;
     }
+
     void setFailedFatally(int code = 0, const QString &msg = QString());
 
     /** @return whether the transaction was completed successfully */
@@ -123,6 +124,7 @@
     {
         return mComplete;
     }
+
     void setComplete()
     {
         mComplete = true;
@@ -146,6 +148,7 @@
     {
         return mDataCommandIssued;
     }
+
     void setDataCommandIssued(bool issued)
     {
         mDataCommandIssued = issued;
@@ -155,6 +158,7 @@
     {
         return mDataCommandIssued && mDataCommandSucceeded;
     }
+
     void setDataCommandSucceeded(bool succeeded, const Response &r);
 
     Response dataResponse() const
@@ -166,6 +170,7 @@
     {
         return mAtLeastOneRecipientWasAccepted;
     }
+
     void setRecipientAccepted()
     {
         mAtLeastOneRecipientWasAccepted = true;
@@ -175,10 +180,12 @@
     {
         return !mRejectedRecipients.empty();
     }
+
     RejectedRecipientList rejectedRecipients() const
     {
         return mRejectedRecipients;
     }
+
     void addRejectedRecipient(const RecipientRejection &r);
     void addRejectedRecipient(const QString &who, const QString &why)
     {
@@ -191,24 +198,25 @@
         mDataResponse.clear();
         mAtLeastOneRecipientWasAccepted
             = mDataCommandIssued
-              = mDataCommandSucceeded
-                = mFailed = mFailedFatally
-                            = mComplete = false;
+                  = mDataCommandSucceeded
+                        = mFailed = mFailedFatally
+                                        = mComplete = false;
     }
 
 #ifdef KIOSMTP_COMPARATORS
     bool operator==(const TransactionState &other) const
     {
         return
-            mAtLeastOneRecipientWasAccepted == other.mAtLeastOneRecipientWasAccepted &&
-            mDataCommandIssued == other.mDataCommandIssued &&
-            mDataCommandSucceeded == other.mDataCommandSucceeded &&
-            mFailed == other.mFailed &&
-            mFailedFatally == other.mFailedFatally &&
-            mComplete == other.mComplete &&
-            mDataResponse.code() == other.mDataResponse.code() &&
-            mRejectedRecipients == other.mRejectedRecipients;
+            mAtLeastOneRecipientWasAccepted == other.mAtLeastOneRecipientWasAccepted
+            && mDataCommandIssued == other.mDataCommandIssued
+            && mDataCommandSucceeded == other.mDataCommandSucceeded
+            && mFailed == other.mFailed
+            && mFailedFatally == other.mFailedFatally
+            && mComplete == other.mComplete
+            && mDataResponse.code() == other.mDataResponse.code()
+            && mRejectedRecipients == other.mRejectedRecipients;
     }
+
 #endif
 
 private:
@@ -224,7 +232,6 @@
     bool mFailedFatally;
     bool mComplete;
 };
-
 } // namespace KioSMTP
 
 #endif // __KIOSMTP_TRANSACTIONSTATE_H__
diff -Nru kmailtransport-16.12.3/kmailtransport.categories kmailtransport-17.04.3/kmailtransport.categories
--- kmailtransport-16.12.3/kmailtransport.categories	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/kmailtransport.categories	2017-06-19 05:09:24.000000000 +0000
@@ -1,3 +1,3 @@
 org.kde.pim.smtp kioslave (smtp)
 org.kde.pim.mailtransport kmailtransport (kmailtransport)
-
+org.kde.pim.mailtransportakonadi kmailtransportakonadi (kmailtransportakonadi)
diff -Nru kmailtransport-16.12.3/metainfo.yaml kmailtransport-17.04.3/metainfo.yaml
--- kmailtransport-16.12.3/metainfo.yaml	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/metainfo.yaml	2017-06-19 05:09:24.000000000 +0000
@@ -1,14 +1,26 @@
-maintainer: mlaurent
+name: kmailtransport
 description: Manage mail transport
-tier: 3
-type: functional
+public_lib: true
+group: kdepim
 platforms:
     - name: All
-portingAid: false
-deprecated: false
-release: false
+irc: akonadi
+
 libraries:
  - qmake: KMailTransport
    cmake: "KF5::MailTransport"
-cmakename: KF5MailTransport
+   cmakename: KF5MailTransport"
+ - qmake: KMailTransportAkonadi
+   cmake: "KF5::MailTransportAkonadi"
+   cmakename: KF5MailTransportAkonadi   
+
 
+group_info:
+    fancyname: KDE PIM
+    maintainer:
+        - mlaurent
+    irc: kontact
+    mailinglist: kde-pim
+    platforms:
+        - All
+    logo: docs/kontact.svg
diff -Nru kmailtransport-16.12.3/po/ar/kio_smtp.po kmailtransport-17.04.3/po/ar/kio_smtp.po
--- kmailtransport-16.12.3/po/ar/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ar/kio_smtp.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,242 @@
+# translation of kio_smtp.po to
+# kio_smtp.po
+# Copyright (C) 2002, 2004, 2006, 2007 YEAR Free Software Foundation, Inc.
+# Aamoui Hicham <amaoui@altern.org>, 2002.
+# Isam Bayazidi <bayazidi@arabeyes.org>, 2002.
+# Ahmad M. Zawawi <azawawi@emirates.net.ae>, 2004.
+# محمد سعد  Mohamed SAAD <metehyi@free.fr>, 2006.
+# AbdulAziz AlSharif <a.a-a.s@hotmail.com>, 2007.
+# Youssef Chahibi <chahibi@gmail.com>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2007-10-14 15:57+0000\n"
+"Last-Translator: Youssef Chahibi <chahibi@gmail.com>\n"
+"Language-Team: <en@li.org>\n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"لقد رفض الخادم أوامر EHLO و HELO كأوامر مجهولة أو غير مُنَفذة \n"
+"من فضلك اتصل بمدير نظام الخادم."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"ردَ الخادم على الأمر %1 غير متوقع\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr "خادم SMTP لا يدعم TLS. قم بتعطيل TLS إذا أردت الاتصال بدون تعمية."
+
+#: command.cpp:197
+#, fuzzy, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"خادم SMTP يزعم أنه يدعم TLS، و لكن المفاوضة فشلت.\n"
+"يمكنك تعطيل TLS في كيدي باستخدام وحدة إعدادات التعمية."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "فشل الاتصال"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "حدوث خطأ أثناء عملية التوثيق: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "لم تزوّد تفاصيل التوثيق"
+
+#: command.cpp:384
+#, fuzzy, kde-format
+msgid "Choose a different authentication method."
+msgstr ""
+"خادم SMTP لا يدعم %1.\n"
+"اختر طريقة توثيق مختلفة.\n"
+"%2"
+
+#: command.cpp:386
+#, fuzzy, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr ""
+"خادم SMTP لا يدعم التوثيق.\n"
+"  %1"
+
+#: command.cpp:387
+#, fuzzy, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr ""
+"خادم SMTP لا يدعم التوثيق.\n"
+"  %1"
+
+#: command.cpp:391
+#, fuzzy, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"خادم SMTP لا يدعم التوثيق.\n"
+"  %1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"فشل التوثيق.\n"
+"غالباً كلمة السر خاطئة.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "تعذر قراءة البيانات من التطبيق."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"محتوى الرسالة غير مقبول.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"رد الخادم:\n"
+" %1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "رد الخادم: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "هذا فشل مؤقت. يمكنك المحاولة مرةً أخرى في ما بعد."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "أرسل التطبيق طلباً غير صالح."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "عنوان المرسل مفقود."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "لم تنجح SMTPProtocol::smtp_open (%1)"
+
+#: smtp.cpp:223
+#, fuzzy, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"خادمك لا يدعم إرسال رسائل بترميز 8 بت.\n"
+"من فضلك استخدم ترميز base64 أو quoted_printable."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "فشل الكتابة إلى المقبس"
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "ردَ SMTP (%1) غير صالح."
+
+#: smtp.cpp:537
+#, fuzzy, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"لم يقبل الخادم الاتصال.\n"
+"%1"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "اسم المستخدم و كلمة السر لحساب SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"الخادم لم يقبل أن يكون عنوان المرسل فارغاً.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"الخادم لم يقبل عنوان المرسل \"%1\":\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"فشل إرسال الرسالة بسب رفض الخادم لبعض المستلمين:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"فشل محاولة إرسال محتوى الرسالة.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "خطأ غير معالج. من فضلك ارسل تقرير بالخلل."
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "دعم التوثيق غير مصرّف compiled داخل kio_smtp."
diff -Nru kmailtransport-16.12.3/po/ar/libmailtransport5.po kmailtransport-17.04.3/po/ar/libmailtransport5.po
--- kmailtransport-16.12.3/po/ar/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ar/libmailtransport5.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,831 @@
+# translation of libmailtransport.po to
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+# Youssef Chahibi <chahibi@gmail.com>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2007-10-14 15:58+0000\n"
+"Last-Translator: Youssef Chahibi <chahibi@gmail.com>\n"
+"Language-Team: <en@li.org>\n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"X-Generator: KBabel 1.11.4\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, fuzzy, kde-format
+msgid "Unique identifier"
+msgstr "وحيدفريد معرَف"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, fuzzy, kde-format
+msgid "User-visible transport name"
+msgstr "المستخدم مرئي نقل الاسم"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, fuzzy, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "الـ الاسم مُستخدَم إلى خادم."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, fuzzy, kde-format
+msgid "Unnamed"
+msgstr "الإ&سم:"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, fuzzy, kde-format
+msgid "SMTP Server"
+msgstr "خادم SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr ""
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, fuzzy, kde-format
+msgid "Transport type"
+msgstr "نقل نوع"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, fuzzy, kde-format
+msgid "Host name of the server"
+msgstr "مضيف الاسم من خادم"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, fuzzy, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "اسم المجال أو العنوان الرقمي للخادم SMTP."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, fuzzy, kde-format
+msgid "Port number of the server"
+msgstr "منفذ رقم من خادم"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, fuzzy, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "رقم المنفذ اللذي يستمع عليه الخادم SMTP. المنفذ الإفتراضي رقمه 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, fuzzy, kde-format
+msgid "User name needed for login"
+msgstr "المستخدم الاسم لـ دخول ، تسجيل"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, fuzzy, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr ""
+"الـ مستخدم الاسم إلى إرسال إلى خادم لـ تخويل\n"
+"ترخيص."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, fuzzy, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "الأمر إلى نفِّذ قبل a بريد"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, fuzzy, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"\n"
+" A أمر إلى تنفيذ إلى بريد إلكتروني\n"
+" هذا مُستخدَم إلى set أعلى SSH لـ\n"
+" غادِر الإيطالية فارغ IF لا أمر تنفيذ n "
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, fuzzy, kde-format
+msgid "Server requires authentication"
+msgstr "الخادم توثق"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, fuzzy, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"\n"
+" كِش خيار IF SMTP خادم توثق قبل بريد\n"
+" هذا هو صدّق SMTP أو n "
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, fuzzy, kde-format
+msgid "Store password"
+msgstr "تخزين كلمة مرور"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, fuzzy, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"\n"
+" كِش خيار إلى كلمة مرور\n"
+" المحفظة KWallet هو متوفّر كلمة مرور هو آمن n\n"
+" على أية حال IF المحفظة KWallet هو ليس متوفّر كلمة مرور بوصة تشكيل ملفّ\n"
+" الـ كلمة مرور هو بوصة تنسيق ليس آمن من فك تشفير IF وصول إلى تشكيل ملفّ هو n "
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, fuzzy, kde-format
+msgid "Encryption method used for communication"
+msgstr "التشفير طريقة مُستخدَم لـ تواصل"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, fuzzy, kde-format
+msgid "No encryption"
+msgstr "لا تشفير"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, fuzzy, kde-format
+msgid "SSL encryption"
+msgstr "تشفير SSL "
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, fuzzy, kde-format
+msgid "TLS encryption"
+msgstr "تشفير TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, fuzzy, kde-format
+msgid "Authentication method"
+msgstr "طريقة المواثقة"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, fuzzy, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"\n"
+" كِش خيار إلى استخدام a مخصص اسم مضيف إلى بريد خادم\n"
+"<p/> هذا هو نظام s اسم مضيف أيار ليس set أو إلى حجاب ، قناع نظام s صحيح اسم "
+"مضيف n "
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, fuzzy, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "إدخال اسم مضيف مُستخدَم إلى خادم."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, fuzzy, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"\n"
+" كِش خيار إلى استخدام a مخصص اسم مضيف إلى بريد خادم\n"
+"<p/> هذا هو نظام s اسم مضيف أيار ليس set أو إلى حجاب ، قناع نظام s صحيح اسم "
+"مضيف n "
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, fuzzy, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr "إدخال اسم مضيف مُستخدَم إلى خادم."
+
+#: kmailtransport/precommandjob.cpp:81
+#, fuzzy, kde-format
+msgid "Executing precommand"
+msgstr "التنفيذ"
+
+#: kmailtransport/precommandjob.cpp:82
+#, fuzzy, kde-format
+msgid "Executing precommand '%1'."
+msgstr "التنفيذ."
+
+#: kmailtransport/precommandjob.cpp:89
+#, fuzzy, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "غير ممكن تنفيذ الأمر التمهيدي '%1'."
+
+#: kmailtransport/precommandjob.cpp:91
+#, fuzzy, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "التنفيذ."
+
+#: kmailtransport/precommandjob.cpp:107
+#, fuzzy, kde-format
+msgid "The precommand crashed."
+msgstr "الـ."
+
+#: kmailtransport/precommandjob.cpp:110
+#, fuzzy, kde-format
+msgid "The precommand exited with code %1."
+msgstr "الـ مع رمز."
+
+#: kmailtransport/smtpjob.cpp:175
+#, fuzzy, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr "أنت تحتاج إلى اسم مستخدم وكلمة مرور لاستخدام هذا الخادم SMTP."
+
+#: kmailtransport/smtpjob.cpp:232
+#, fuzzy, kde-format
+msgid "Unable to create SMTP job."
+msgstr "عاجز إلى إ_نشئ SMTP شغل."
+
+#: kmailtransport/transport.cpp:92
+#, fuzzy, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 %2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr ""
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr ""
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr ""
+
+#: kmailtransport/transport.cpp:226
+#, fuzzy, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"المحفظة KWallet هو ليس متوفّر itإيطالياهو هو مفضّل إلى استخدام المحفظة KWallet "
+"لـ كلمة مرور بوصة تشكيل ملفّ الـ كلمة مرور هو بوصة تنسيق ليس آمن من فك تشفير "
+"IF وصول إلى تشكيل ملفّ هو إلى تخزين كلمة مرور لـ خادم بوصة تشكيل ملفّ?"
+
+#: kmailtransport/transport.cpp:234
+#, fuzzy, kde-format
+msgid "KWallet Not Available"
+msgstr "البرنامج KWallet غير متوفر"
+
+#: kmailtransport/transport.cpp:235
+#, fuzzy, kde-format
+msgid "Store Password"
+msgstr "إحفظ كلمة المرور"
+
+#: kmailtransport/transport.cpp:236
+#, fuzzy, kde-format
+msgid "Do Not Store Password"
+msgstr "لا تحفظ كلمة المرور"
+
+#: kmailtransport/transportjob.cpp:131
+#, fuzzy, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "الـ بريد نقل هو ليس مُهيّء."
+
+#: kmailtransport/transportmanager.cpp:249
+#, fuzzy, kde-format
+msgid "Default Transport"
+msgstr "افتراضي نقل"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:472
+#, fuzzy, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:668
+#, fuzzy, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"الـ متابعة بريد تخزين بوصة تشكيل ملفّ بوصة المحفظة KWallet هو مفضّل إلى "
+"استخدام المحفظة KWallet لـ كلمة مرور تخزين لـ أمن إلى إلى المحفظة KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, fuzzy, kde-format
+msgid "Question"
+msgstr "سؤال"
+
+#: kmailtransport/transportmanager.cpp:675
+#, fuzzy, kde-format
+msgid "Migrate"
+msgstr "هاجر"
+
+#: kmailtransport/transportmanager.cpp:675
+#, fuzzy, kde-format
+msgid "Keep"
+msgstr "حافظ عليه"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, fuzzy, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "نقل النوع"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, fuzzy, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "الإ&سم:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, fuzzy, kde-format
+msgid "Type"
+msgstr "النوع"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, fuzzy, kde-format
+msgid "Description"
+msgstr "لا تشفير"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, fuzzy, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "&عام"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, fuzzy, kde-format
+msgid "&Login:"
+msgstr "اسم الد&خول:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, fuzzy, kde-format
+msgid "P&assword:"
+msgstr "&كلمة المرور:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, fuzzy, kde-format
+msgid "The password to send to the server for authorization."
+msgstr ""
+"الـ كلمة مرور إلى إرسال إلى خادم لـ تخويل\n"
+"ترخيص."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, fuzzy, kde-format
+msgid "&Store SMTP password"
+msgstr "&إحفظ كلمة المرور SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, fuzzy, kde-format
+msgid "Server &requires authentication"
+msgstr "&يحتاج الخادم إلى التوثيق"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, fuzzy, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "مت&قدم"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, fuzzy, kde-format
+msgid "This server does not support authentication"
+msgstr "هذا خادم ليس دعم توثق"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, fuzzy, kde-format
+msgid "Encryption:"
+msgstr "التشفير"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, fuzzy, kde-format
+msgid "&None"
+msgstr "&بدون"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, fuzzy, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, fuzzy, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, fuzzy, kde-format
+msgid "&Port:"
+msgstr "ال&منفذ:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, fuzzy, kde-format
+msgid "Authentication:"
+msgstr "طريقة المواثقة"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, fuzzy, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "أ&رسل اسم المضيف  المعتاد إلى الخادم"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, fuzzy, kde-format
+msgid "Hostna&me:"
+msgstr "الم&ضيف:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, fuzzy, kde-format
+msgid "Precommand:"
+msgstr "قبل القيادة:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, fuzzy, kde-format
+msgid "Remo&ve"
+msgstr "إ&زالة"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, fuzzy, kde-format
+msgid "&Set as Default"
+msgstr "تعيين الافتراضي"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, fuzzy, kde-format
+msgid "A&dd..."
+msgstr "أ&ضف..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, fuzzy, kde-format
+msgid "&Rename"
+msgstr "الإ&سم:"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, fuzzy, kde-format
+msgid "&Modify..."
+msgstr "&عدّل..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr ""
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, fuzzy, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "الـ بريد نقل هو ليس مُهيّء."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, fuzzy, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "الاسم"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, fuzzy, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "النوع"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, fuzzy, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " ( الإفتراضي )"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, fuzzy, kde-format
+msgid "Add..."
+msgstr "أ&ضف..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, fuzzy, kde-format
+msgid "Modify..."
+msgstr "&عدّل..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, fuzzy, kde-format
+msgid "Rename"
+msgstr "الإ&سم:"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, fuzzy, kde-format
+msgid "Remove"
+msgstr "إ&زالة"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, fuzzy, kde-format
+msgid "Set as Default"
+msgstr "تعيين الافتراضي"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr ""
+
+#, fuzzy
+#~ msgid "Hos&tname:"
+#~ msgstr "اسم ال&مضيف:"
+
+#, fuzzy
+#~ msgid "Local sendmail"
+#~ msgstr "محلي sendmail"
+
+#, fuzzy
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "فشل في تنفيذ برنامج mailer %1"
+
+#, fuzzy
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "انتهى البرنامج Sendmail بشكل غير طبيعي."
+
+#, fuzzy
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail 1"
+
+#, fuzzy
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#, fuzzy
+#~ msgid "A local sendmail installation"
+#~ msgstr "محلي sendmail"
+
+#, fuzzy
+#~ msgid "Sendmail &Location:"
+#~ msgstr "إختار موقع البرنامج sendmail"
+
+#, fuzzy
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "تحقق من &ما يدعم الخادم"
+
+#, fuzzy
+#~ msgid "Authentication Method"
+#~ msgstr "طريقة التحقق"
+
+#, fuzzy
+#~ msgid "&LOGIN"
+#~ msgstr "&LOGIN"
+
+#, fuzzy
+#~ msgid "&PLAIN"
+#~ msgstr "&PLAIN"
+
+#, fuzzy
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#, fuzzy
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#, fuzzy
+#~ msgid "&GSSAPI"
+#~ msgstr "&GSSAPI"
+
+#, fuzzy
+#~ msgid "&NTLM"
+#~ msgstr "&NTLM"
+
+#, fuzzy
+#~ msgid "Transport: Sendmail"
+#~ msgstr "النّقل: Sendmail"
+
+#, fuzzy
+#~ msgid "&Location:"
+#~ msgstr "ال&موقع:"
+
+#, fuzzy
+#~ msgid "Choos&e..."
+#~ msgstr "إخت&ر..."
+
+#, fuzzy
+#~ msgid "Transport: SMTP"
+#~ msgstr "النّقل: ميفاق نقل البريد البسيط SMTP"
+
+#, fuzzy
+#~ msgid "1"
+#~ msgstr "1"
+
+#, fuzzy
+#~ msgid "Use Sendmail"
+#~ msgstr "Sendmail"
+
+#, fuzzy
+#~ msgid "Only local files allowed."
+#~ msgstr "مسموح فقط الملفات المحليّة."
+
+#, fuzzy
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "إضافة طريقة نقل"
+
+#, fuzzy
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "غير طريقة النقل"
+
+#, fuzzy
+#~ msgid "SM&TP"
+#~ msgstr "SM&TP"
+
+#, fuzzy
+#~ msgid "&Sendmail"
+#~ msgstr "&Sendmail"
+
+#, fuzzy
+#~ msgid "Add Transport"
+#~ msgstr "إضافة طريقة نقل"
diff -Nru kmailtransport-16.12.3/po/ast/kio_smtp.po kmailtransport-17.04.3/po/ast/kio_smtp.po
--- kmailtransport-16.12.3/po/ast/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ast/kio_smtp.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,199 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# enolp <enolp@softastur.org>, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-12-19 03:05+0100\n"
+"Last-Translator: enolp <enolp@softastur.org>\n"
+"Language-Team: Asturian <alministradores@softastur.org>\n"
+"Language: ast\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 2.0\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr ""
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr ""
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr ""
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr ""
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr ""
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr ""
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr ""
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr ""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr ""
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr ""
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr ""
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr ""
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr ""
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr ""
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr ""
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr ""
diff -Nru kmailtransport-16.12.3/po/ast/libmailtransport5.po kmailtransport-17.04.3/po/ast/libmailtransport5.po
--- kmailtransport-16.12.3/po/ast/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ast/libmailtransport5.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,686 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# enolp <enolp@softastur.org>, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-12-19 02:57+0100\n"
+"Last-Translator: enolp <enolp@softastur.org>\n"
+"Language-Team: Asturian <alministradores@softastur.org>\n"
+"Language: ast\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 2.0\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr ""
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr ""
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr ""
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr ""
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr ""
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr ""
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr ""
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr ""
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr ""
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr ""
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr ""
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr ""
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr ""
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr ""
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr ""
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr ""
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr ""
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr ""
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr ""
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr ""
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr ""
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr ""
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr ""
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr ""
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr ""
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr ""
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr ""
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr ""
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr ""
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr ""
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr ""
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Mensaxe baleru."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr ""
diff -Nru kmailtransport-16.12.3/po/bg/kio_smtp.po kmailtransport-17.04.3/po/bg/kio_smtp.po
--- kmailtransport-16.12.3/po/bg/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/bg/kio_smtp.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,235 @@
+# translation of kio_smtp.po to Bulgarian
+# Bulgarian translation of KDE.
+# This file is licensed under the GPL.
+#
+# $Id: kio_smtp.po 1486852 2017-04-07 03:05:00Z scripty $
+#
+# Zlatko Popov <zlatkopopov@fsa-bg.org>, 2006, 2007.
+# Yasen Pramatarov <yasen@lindeas.com>, 2009, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-06-18 19:02+0300\n"
+"Last-Translator: Yasen Pramatarov <yasen@lindeas.com>\n"
+"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
+"Language: bg\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Сървърът отхвърли и двете команди EHLO и HELO, като неизвестни или "
+"нереализирани.\n"
+"Моля, свържете се със системния администратор на сървъра."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Неочакван отговор от сървъра на командата %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Сървърът не поддържа TLS. Изключете опцията за шифрована връзка, ако искате "
+"да се свържете."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Сървърът SMTP твърди, че поддържа TLS но договарянето беше неуспешно.\n"
+"Може да изключете шифрованата връзка от прозореца с настройки за сметката."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Неуспешна връзка"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Възникна грешка при удостоверяване: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Няма изпратени данни за идентификация."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Изберете друг метод за идентификация."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Сървърът SMTP не поддържа %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Сървърът SMTP не поддържа това (не е определено)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Сървърът SMTP не поддържа удостоверяване.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Удостоверяването се провали.\n"
+"Вероятно паролата е невалидна.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Не могат да бъдат прочетени данни от програмата."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Съдържанието на съобщението не е прието.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Отговор от сървъра:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Отговор от сървъра: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Временен проблем. Може да опитате по-късно."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Програмата изпрати невалидна заявка."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Липсва адресът на изпращача."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "Отварянето на SMTPProtocol::smtp_open се провали (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Сървърът (%1) не поддържа изпращането на съобщения кодирани с 8 битова "
+"кодова таблица.\n"
+"Моля, използвайте кодиране base64 или quoted-printable."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Записът във сокета беше неуспешен."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Получи се невалиден отговор SMTP (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Сървърът (%1) не прие връзката.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Потребител и парола за SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Сървърът не приема празен адрес на изпращач.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Сървърът отхвърли адреса на изпращача \"%1\".\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Изпращането на съобщението се провали, понеже следните получатели бяха "
+"отхвърлени от сървъра:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Опитът да се изпрати съдържанието на съобщението се провали.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Непозната грешка. Моля, изпратете съобщение за грешка."
diff -Nru kmailtransport-16.12.3/po/bs/kio_smtp.po kmailtransport-17.04.3/po/bs/kio_smtp.po
--- kmailtransport-16.12.3/po/bs/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/bs/kio_smtp.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,232 @@
+# Bosnian translation for kdepimlibs
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the kdepimlibs package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kdepimlibs\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2012-09-03 12:47+0000\n"
+"Last-Translator: Samir Ribić <Unknown>\n"
+"Language-Team: Bosnian <bs@li.org>\n"
+"Language: bs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-10-19 05:19+0000\n"
+"X-Generator: Launchpad (build 16807)\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Server je odbacio i naredbu <command>EHLO</command> i <command>HELO</"
+"command> kao nepoznate ili neizvedene.\n"
+"Obratite se sistem-administratoru servera."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Neočekivani odziv servera na naredbu <command>%1</command>.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"SMTP server ne podržava TLS. Isključite TLS ako želite da se povezujete bez "
+"šifrovanja."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"SMTP server tvrdi da podržava TLS, ali pregovaranje nije uspelo.\n"
+"TLS možete isključiti u dijalogu postavki SMTP naloga."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Neuspjelo povezivanje"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Greška pri autentifikaciji: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Nisu dati detalji za autentifikaciju."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Izaberite drugi metod autentifikacije."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Dati SMTP server ne podržava %1.."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Dati SMTP server ne podržava (neodređeni metod)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Dati SMTP server ne podržava autentifikaciju.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Neuspjela autentifikacija.\n"
+"Vjerovatno je lozinka pogrešna.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Ne mogu da pročitam podatke iz programa."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Sadržaj poruke nije prihvaćen.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Server javlja:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Server javlja: „%1“"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Privremeni neuspjeh. Možete da pokušate ponovo kasnije."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Program je poslao neispravan zahtjev."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Nedostaje adresa pošiljaoca."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open nije uspio (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Server (%1) ne podržava slanje 8‑bitnih poruka.\n"
+"Koristite kodiranje base64 ili navod-čitko."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Neuspeo upis u soket."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Primljen pogrešan SMTP odziv (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Server (%1) nije prihvatio vezu.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Korisničko ime i lozinka SMTP‑a naloga:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Server nije prihvatio praznu adresu pošiljaoca.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Server nije prihvatio adresu pošiljaoca „%1“.\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Slanje poruke nije uspjelo zato što je server odbacio sljedeće primaoce:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Pokušaj slanja sadržaja poruke nije uspio.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Nepoznata greška. Molimo podnesite izvještaj o ovome."
diff -Nru kmailtransport-16.12.3/po/bs/libmailtransport5.po kmailtransport-17.04.3/po/bs/libmailtransport5.po
--- kmailtransport-16.12.3/po/bs/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/bs/libmailtransport5.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,757 @@
+# Bosnian translation for kdepimlibs
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the kdepimlibs package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kdepimlibs\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2013-11-15 13:49+0000\n"
+"Last-Translator: Samir Ribić <Unknown>\n"
+"Language-Team: Bosnian <bs@li.org>\n"
+"Language: bs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-11-16 06:22+0000\n"
+"X-Generator: Launchpad (build 16831)\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Jedinstveni identifikator"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Transportno ime koje vidi korisnik"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Ime koje će se koristiti kada se odnosi na ovaj server."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Neimenovano"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP server"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi Resurs"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Tip transporta"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Ime servera"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Domensko ime ili numerička adresa SMTP servera."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Broj porta na serveru"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "Broj porta na kojem SMTP server osluškuje. Uobičajeni port je 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Potrebno je korisničko ime za prijavu"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Korisničko ime koje se šalje serveru na provjeru."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Naredba koja se izvršava prije slanja poruke"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Naredba koja se izvršava lokalno, prije slanja poruke. Ovo se može koristit "
+"da se podese SSH tuneli, na primjer. Ostavite prazno ako se nijedna naredba "
+"ne treba izvršavati."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Server zahtijeva autentifikaciju"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Uključite ovu opciju ako vaš SMTP server traži da potvrdite vaš identitet "
+"prije prihvatanja pošte. Ovo je poznato kao 'Authenticated SMTP' ili kraće "
+"ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Spremi lozinku"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Uključite ovu opciju da spremite vašu lozinku.\n"
+"Ako je KWallet dostupan onda će se lozinka tu spremiti, što se smatra "
+"sigurnim.\n"
+"Ako ipak KWallet nije dostupan onda će se lozinka spremiti u konfiguracionu "
+"datoteku. Lozinka se sprema u kodiranom formatu, ali se ne treba smatrat "
+"sigurnom protiv dekripcije ako se dobije pristup konfiguracijskoj datoteci."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Metod šifrovanja korišten za komunikaciju"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Ne koristi se šifrovanje"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL šifrovanje"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS šifrovanje"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Metod autentifikacije"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Označiti ovu opciju za korištenje imena servera za identifikaciju mail "
+"servera. Ovo je korisno ako vaše ime računara nije ispravno postavljeno ili "
+"da sakrije pravo ime vašeg računara."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Unesite ime koje bi se trebalo koristiti za identifikaciju servera."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Uključite ako želite posebnu adresu pošiljaoca za identifikaciju na serveru "
+"pošte. U suprotnom, koristi se adresa iz identiteta."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr "Adresa kojom se zamjenjuje podrazumijevana adresa pošiljaoca."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Izvršavam prednaredbu"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Izvršavam prednaredbe '%1'"
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Ne mogu pokrenuti prednaredbe '%1'"
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Greška pri izvršavanju prednaredbe '%1'"
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Prednaredba je krahirala."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Prednaredba je izašla sa šifrom %1"
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Morate unijeti korisničko ime i šifru ako želite pristupiti SMTP serveru."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Ne mogu kreirati SMTP postupak."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Otvoreni tekst"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anoniman"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Nepoznat"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet nije dostupan. Preporučuje se korištenje KWallet-a za upravljanje "
+"lozinkama.\n"
+"Lozinka se može spremiti u konfiguracijsku datoteku. Lozinka se sprema u "
+"šifrovanom formatu, ali se ne treba se smatrat sigurnom od dešifrovanja ako "
+"se dobije pristup konfiguracijskoj datoteci.\n"
+"Da li želite spremiti lozinku za server '%1' u konfiguracijsku datoteku?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet nije dostupan"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Pohrani lozinku"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Ne pohranjuj lozinku"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Odlazni nalog \"%1\" nije ispravno konfigurisan."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Podrazumijevani transport"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Morate kreirati izlazni račun prije slanja."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Kreirati račun?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Kreirati račun sada"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Podesi račun"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "SMTP server na internetu"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Navedeni transporti poruka spremaju svoje lozinke u nešifrovanu "
+"konfiguracijsku datoteku.\n"
+"Iz sigurnosnih razloga razmotrite prebacivanje lozinki u KWallet, KDE Wallet "
+"program upravljački program,\n"
+"koji sprema osjetljive podatke u jako šifrovanu datoteku.\n"
+"Da li želite prebaciti lozinke u KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Pitanje"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Prebaci"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Zadrži"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Prvi korak: Odaberite tip transporta"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Ime:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Podesiti da ovo bude podrazumijevani izlazni račun."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Izaberite vrstu računa sa liste:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Tip"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Opis"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Opšte"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Podaci o računu"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, fuzzy, kde-format
+#| msgid "Outgoing mail &server:"
+msgid "Outgoing &mail server:"
+msgstr "&Server izlazne pošte:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Korisnik:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "L&ozinka:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Lozinka koja se šalje serveru na provjeru"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Spremi SMTP lozinku"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Server &traži potvrdu identiteta"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Napredno"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Postavke povezivanja"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Automatska Detekcija"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Server ne podržava autentifikaciju"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Šifrovanje:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Nikakvo"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Potvrda autentičnosti:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP podešavanja"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Poša&lji vlastito ime računara serveru"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Posebna adresa pošiljaoca"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Adresa pošiljaoca:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Prednaredba:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Ukloni"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "&Postavi kao podrazumijevano"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "D&odaj..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Preimenuj"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Izmijeni..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Kreiraj izlazni račun"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Napravi i podesi"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Odlazni nalog se ne može konfigurisati"
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Ime"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Vrsta"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Podrazumijevano)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Želite li ukloniti izlazni nalog '%1'?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Ukloniti izlazni nalog?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Dodaj..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Izmijeni..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Preimenuj"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Ukloni"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Postavi kao podrazumijevano"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Prazna poruka."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Poruka nema primaoca."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Poruka ima pogrešan transport."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Poruka ima pogrešan direktorij poslane pošte."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Ime r&ačunara:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Lokalna poslana pošta"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Ne mogu izvršiti program za poštu %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail je završio neispravno."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail je izašao sa greškom: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Lokalna sendmail instalacija"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Sendmail &Lokacija:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "&Server pošte:"
+
+#~ msgctxt ""
+#~ "o/o1: name; o/o2: number appended to it to make it unique among a list of "
+#~ "names"
+#~ msgid "%1 #%2"
+#~ msgstr "%1 #%2"
+
+#~ msgid "Edit..."
+#~ msgstr "Izmijeni..."
diff -Nru kmailtransport-16.12.3/po/ca/docs/kioslave5/smtp/index.docbook kmailtransport-17.04.3/po/ca/docs/kioslave5/smtp/index.docbook
--- kmailtransport-16.12.3/po/ca/docs/kioslave5/smtp/index.docbook	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ca/docs/kioslave5/smtp/index.docbook	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
+<!ENTITY % addindex "IGNORE">
+<!ENTITY % Catalan  "INCLUDE"
+> <!-- change language only here -->
+]>
+	
+<article lang="&language;" id="smtp">
+<title
+>smtp</title>
+<articleinfo>
+<authorgroup>
+<author
+>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+&traductor.Antoni.Bella; 
+</authorgroup>
+</articleinfo>
+<para
+>Un protocol per enviar correu des de l'estació del client cap al servidor de correu. </para>
+
+<para
+>Vegeu: <ulink url="http://cr.yp.to/smtp.html"
+>Protocol simple de transferència de correu</ulink
+>. </para>
+
+</article>
diff -Nru kmailtransport-16.12.3/po/ca/kio_smtp.po kmailtransport-17.04.3/po/ca/kio_smtp.po
--- kmailtransport-16.12.3/po/ca/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ca/kio_smtp.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,238 @@
+# Translation of kio_smtp.po to Catalan
+# Copyright (C) 2002-2016 This_file_is_part_of_KDE
+#
+# Antoni Bella Pérez <antonibella5@yahoo.com>, 2002, 2003, 2014, 2016.
+# Sebastià Pla i Sanz <sps@sastia.com>, 2004, 2005.
+# Albert Astals Cid <aacid@kde.org>, 2005, 2007.
+# Josep Ma. Ferrer <txemaq@gmail.com>, 2007, 2008, 2010.
+# Manuel Tortosa Moreno <manutortosa@gmail.com>, 2009, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-10-11 21:53+0100\n"
+"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
+"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Accelerator-Marker: &\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"El servidor ha refusat tant l'ordre EHLO com HELO com a desconegudes o sense "
+"implementar.\n"
+"Contacteu amb l'administrador del sistema del servidor."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Resposta inesperada del servidor a l'ordre %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"El servidor SMTP no permet el TLS. Desactiveu-lo, si voleu connectar sense "
+"encriptatge."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"El servidor SMTP diu que permet el TLS, però la negociació no ha tingut "
+"èxit.\n"
+"Podeu desactivar TLS al diàleg d'arranjament del compte SMTP."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "La connexió ha fallat"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "S'ha produït un error durant l'autenticació: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "No s'han proporcionat detalls de l'autenticació."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Seleccioneu un mètode d'autenticació diferent."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "El servidor SMTP no permet %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "El servidor SMTP no ho permet (mètode sense especificar)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"El servidor SMTP no permet l'autenticació.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"L'autenticació ha fallat.\n"
+"Probablement la contrasenya és incorrecta.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "No es poden llegir les dades des de l'aplicació."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"El contingut del missatge no ha estat acceptat.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"El servidor ha respost:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "El servidor ha respost: «%1»"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Això és una fallada temporal. Torneu-ho a provar més tard."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "L'aplicació ha enviat una petició no vàlida."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Falta l'adreça del remitent."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "Ha fallat SMTPProtocol::smtp_open (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"El servidor (%1) no permet l'enviament de missatges de 8 bits.\n"
+"Si us plau, useu la codificació base64 o «citat imprimible»."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Ha fallat en escriure al sòcol."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "S'ha rebut una resposta SMTP no vàlida (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"El servidor (%1) no ha acceptat la connexió.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Nom d'usuari i contrasenya pel compte SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"El servidor no accepta una adreça del remitent en blanc.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"El servidor no accepta l'adreça del remitent «%1».\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"L'enviament del missatge ha fallat perquè els següents destinataris han "
+"estat refusats pel servidor:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"L'intent d'iniciar l'enviament del contingut del missatge ha fallat.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr ""
+"La condició d'error no es pot gestionar. Si us plau, envieu un informe "
+"d'error."
diff -Nru kmailtransport-16.12.3/po/ca/libmailtransport5.po kmailtransport-17.04.3/po/ca/libmailtransport5.po
--- kmailtransport-16.12.3/po/ca/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ca/libmailtransport5.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,760 @@
+# Translation of libmailtransport5.po to Catalan
+# Copyright (C) 2014-2016 This_file_is_part_of_KDE
+# This file is distributed under the license LGPL version 2.1 or
+# version 3 or later versions approved by the membership of KDE e.V.
+#
+# Josep Ma. Ferrer <txemaq@gmail.com>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015.
+# Manuel Tortosa Moreno <manutortosa@gmail.com>, 2009, 2010.
+# Antoni Bella Pérez <antonibella5@yahoo.com>, 2012, 2013, 2014, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport5\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-03-18 14:18+0100\n"
+"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
+"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Accelerator-Marker: &\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Identificador únic"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Nom de transport visible per l'usuari"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "El nom que s'usarà per a referir-se a aquest servidor."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Sense nom"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "Servidor SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Recurs de l'Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Tipus de transport"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Nom d'ordinador del servidor"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "El nom de domini o l'adreça numèrica del servidor SMTP."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Número de port del servidor"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"El número de port pel qual està escoltant el servidor SMTP. El port per "
+"omissió és el 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Nom d'usuari necessari per iniciar la sessió"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "El nom d'usuari a enviar al servidor per l'autorització."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Ordre a executar abans d'enviar un correu"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Una ordre a executar localment, abans d'enviar un correu. Això pot servir "
+"per establir túnels SSH, per exemple. Deixeu-ho buit si no s'ha d'executar "
+"cap ordre."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "El servidor requereix autenticació"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Marqueu aquesta opció si el servidor SMTP requereix autenticació abans "
+"d'acceptar correu. Això es coneix com a «SMTP autenticat» o simplement ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Emmagatzema la contrasenya"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Marqueu aquesta opció per emmagatzemar la contrasenya.\n"
+"Si està disponible el KWallet, la contrasenya es desarà allí, perquè es "
+"considera segur.\n"
+"Al contrari, si no està disponible el KWallet, la contrasenya es desarà al "
+"fitxer de configuració. La contrasenya es desa en un format ofuscat, però no "
+"s'ha de considerar segur per evitar-ne el desencriptatge si s'obté l'accés "
+"al fitxer de configuració."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Mètode d'encriptatge usat per a la comunicació"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Sense encriptatge"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "Encriptatge SSL"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "Encriptatge TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Mètode d'autenticació"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- pendent -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Marqueu aquesta opció per usar un nom d'ordinador personalitzat que "
+"identifiqui el servidor de correu. Això és útil quan el nom d'ordinador del "
+"sistema no es pot establir correctament o per emmascarar el nom d'ordinador "
+"real del sistema."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+"Introduïu el nom d'ordinador que s'hauria d'usar per identificar al servidor."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Activeu aquesta opció per usar una adreça de remitent personalitzada que "
+"identifiqui al servidor de correu. Si no està activa, s'utilitzarà l'adreça "
+"de la identitat."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Introduïu l'adreça que s'ha d'utilitzar per a substituir l'adreça per "
+"omissió del remitent."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "S'està executant l'ordre prèvia"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "S'està executant l'ordre prèvia «%1»."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "No s'ha pogut iniciar l'ordre prèvia «%1»."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Error en executar l'ordre prèvia «%1»."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "L'ordre prèvia ha fallat."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "L'ordre prèvia ha sortit amb el codi %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Heu de proporcionar un nom d'usuari i una contrasenya per a usar aquest "
+"servidor SMTP."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "No s'ha pogut crear el treball SMTP."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 núm. %2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Text en clar"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anònim"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"El KWallet no és disponible. Us recomanem fermament que useu el KWallet per "
+"a gestionar les contrasenyes.\n"
+"Tanmateix, la contrasenya es pot emmagatzemar al fitxer de configuració. La "
+"contrasenya es desa en un format ofuscat, però no s'hauria de considerar "
+"segur davant d'esforços de desencriptatge si s'obté l'accés al fitxer de "
+"configuració.\n"
+"Voleu desar la contrasenya pel servidor «%1» en el fitxer de configuració?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "El KWallet no està disponible"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Emmagatzema la contrasenya"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "No emmagatzemis la contrasenya"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "El compte sortint «%1» no està configurat correctament."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Transport per omissió"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Heu de crear un compte sortint abans d'enviar."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Creo un compte ara?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Crea un compte ara"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Configura el compte"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Un servidor SMTP a Internet"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Els transports de correu següents emmagatzemen les contrasenyes en un fitxer "
+"de configuració sense encriptar.\n"
+"Per motius de seguretat considereu la migració d'aquestes contrasenyes al "
+"KWallet, l'eina de gestió de carteres del KDE, que emmagatzema les dades "
+"sensibles en un fitxer robustament encriptat.\n"
+"Voleu migrar les contrasenyes al KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Pregunta"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Migra"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Conserva"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Primer pas: seleccioneu el tipus de transport"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Nom:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Fes que aquest sigui el compte sortint per omissió."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Seleccioneu un tipus de compte de la llista de baix:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Tipus"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Descripció"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "General"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Informació del compte"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Servidor de &correu de sortida:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Connexió:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "Contr&asenya:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "La contrasenya a enviar al servidor per l'autorització."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Emmagatzema la contrasenya SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "El servidor &requereix autenticació"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Avançat"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Arranjament de la connexió"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Detecta automàticament"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Aquest servidor no permet autenticació"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Encriptatge:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "C&ap"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Autenticació:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Arranjament de l'SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "En&via el nom d'ordinador personalitzat al servidor"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "Nom de la &màquina:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Usa una adreça de remitent personalitzada"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Adreça del remitent:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Ordre prèvia:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "E&limina"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "&Estableix per omissió"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "A&fegeix..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Reanomena"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Modifica..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Crea un compte sortint"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Crea i configura"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Error en comprovar les capacitats. Si us plau, verifiqueu el port i el mode "
+"d'autenticació."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Ha fallat en comprovar les capacitats"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Aquest compte sortint no es pot configurar."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Nom"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Tipus"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Omissió)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Voleu eliminar el compte sortint «%1»?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Elimino el compte sortint?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Afegeix..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Modifica..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Reanomena"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Elimina"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Estableix per omissió"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Missatge buit."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "El missatge no té destinataris."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "El missatge té un transport no vàlid."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "El missatge té una carpeta no vàlida de correu enviat."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "N&om de l'ordinador:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Sendmail local"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Ha fallat en executar el programa de correu %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "El Sendmail ha sortit anormalment."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "El Sendmail ha sortit anormalment: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Una instal·lació local de Sendmail"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "&Ubicació del Sendmail:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "&Servidor de correu:"
diff -Nru kmailtransport-16.12.3/po/ca@valencia/kio_smtp.po kmailtransport-17.04.3/po/ca@valencia/kio_smtp.po
--- kmailtransport-16.12.3/po/ca@valencia/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ca@valencia/kio_smtp.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,238 @@
+# Translation of kio_smtp.po to Catalan (Valencian)
+# Copyright (C) 2002-2016 This_file_is_part_of_KDE
+#
+# Antoni Bella Pérez <antonibella5@yahoo.com>, 2002, 2003, 2014, 2016.
+# Sebastià Pla i Sanz <sps@sastia.com>, 2004, 2005.
+# Albert Astals Cid <aacid@kde.org>, 2005, 2007.
+# Josep Ma. Ferrer <txemaq@gmail.com>, 2007, 2008, 2010.
+# Manuel Tortosa Moreno <manutortosa@gmail.com>, 2009, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-10-11 21:53+0100\n"
+"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
+"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
+"Language: ca@valencia\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Accelerator-Marker: &\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"El servidor ha refusat tant l'orde EHLO com HELO com a desconegudes o sense "
+"implementar.\n"
+"Contacteu amb l'administrador del sistema del servidor."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Resposta inesperada del servidor a l'orde %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"El servidor SMTP no permet el TLS. Desactiveu-lo, si voleu connectar sense "
+"encriptatge."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"El servidor SMTP diu que permet el TLS, però la negociació no ha tingut "
+"èxit.\n"
+"Podeu desactivar TLS al diàleg d'arranjament del compte SMTP."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "La connexió ha fallat"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "S'ha produït un error durant l'autenticació: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "No s'han proporcionat detalls de l'autenticació."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Seleccioneu un mètode d'autenticació diferent."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "El servidor SMTP no permet %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "El servidor SMTP no ho permet (mètode sense especificar)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"El servidor SMTP no permet l'autenticació.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"L'autenticació ha fallat.\n"
+"Probablement la contrasenya és incorrecta.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "No es poden llegir les dades des de l'aplicació."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"El contingut del missatge no ha estat acceptat.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"El servidor ha respost:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "El servidor ha respost: «%1»"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Això és una fallada temporal. Torneu-ho a provar més tard."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "L'aplicació ha enviat una petició no vàlida."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Falta l'adreça del remitent."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "Ha fallat SMTPProtocol::smtp_open (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"El servidor (%1) no permet l'enviament de missatges de 8 bits.\n"
+"Per favor, useu la codificació base64 o «citat imprimible»."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Ha fallat en escriure al sòcol."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "S'ha rebut una resposta SMTP no vàlida (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"El servidor (%1) no ha acceptat la connexió.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Nom d'usuari i contrasenya pel compte SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"El servidor no accepta una adreça del remitent en blanc.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"El servidor no accepta l'adreça del remitent «%1».\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"L'enviament del missatge ha fallat perquè els següents destinataris han "
+"estat refusats pel servidor:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"L'intent d'iniciar l'enviament del contingut del missatge ha fallat.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr ""
+"La condició d'error no es pot gestionar. Per favor, envieu un informe "
+"d'error."
diff -Nru kmailtransport-16.12.3/po/ca@valencia/libmailtransport5.po kmailtransport-17.04.3/po/ca@valencia/libmailtransport5.po
--- kmailtransport-16.12.3/po/ca@valencia/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ca@valencia/libmailtransport5.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,760 @@
+# Translation of libmailtransport5.po to Catalan (Valencian)
+# Copyright (C) 2014-2016 This_file_is_part_of_KDE
+# This file is distributed under the license LGPL version 2.1 or
+# version 3 or later versions approved by the membership of KDE e.V.
+#
+# Josep Ma. Ferrer <txemaq@gmail.com>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2015.
+# Manuel Tortosa Moreno <manutortosa@gmail.com>, 2009, 2010.
+# Antoni Bella Pérez <antonibella5@yahoo.com>, 2012, 2013, 2014, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport5\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-03-18 14:18+0100\n"
+"Last-Translator: Antoni Bella Pérez <antonibella5@yahoo.com>\n"
+"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
+"Language: ca@valencia\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Accelerator-Marker: &\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Identificador únic"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Nom de transport visible per l'usuari"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "El nom que s'usarà per a referir-se a este servidor."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Sense nom"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "Servidor SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Recurs de l'Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Tipus de transport"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Nom d'ordinador del servidor"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "El nom de domini o l'adreça numèrica del servidor SMTP."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Número de port del servidor"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"El número de port pel qual està escoltant el servidor SMTP. El port per "
+"omissió és el 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Nom d'usuari necessari per iniciar la sessió"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "El nom d'usuari a enviar al servidor per l'autorització."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Orde a executar abans d'enviar un correu"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Una orde a executar localment, abans d'enviar un correu. Això pot servir per "
+"establir túnels SSH, per exemple. Deixeu-ho buit si no s'ha d'executar cap "
+"orde."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "El servidor requereix autenticació"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Marqueu esta opció si el servidor SMTP requereix autenticació abans "
+"d'acceptar correu. Això es coneix com a «SMTP autenticat» o simplement ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Emmagatzema la contrasenya"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Marqueu esta opció per emmagatzemar la contrasenya.\n"
+"Si està disponible el KWallet, la contrasenya es guardarà allí, perquè es "
+"considera segur.\n"
+"Al contrari, si no està disponible el KWallet, la contrasenya es guardarà al "
+"fitxer de configuració. La contrasenya es guarda en un format ofuscat, però "
+"no s'ha de considerar segur per evitar-ne el desencriptatge si s'obté "
+"l'accés al fitxer de configuració."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Mètode d'encriptatge usat per a la comunicació"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Sense encriptatge"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "Encriptatge SSL"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "Encriptatge TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Mètode d'autenticació"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- pendent -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Marqueu esta opció per usar un nom d'ordinador personalitzat que identifiqui "
+"el servidor de correu. Això és útil quan el nom d'ordinador del sistema no "
+"es pot establir correctament o per emmascarar el nom d'ordinador real del "
+"sistema."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+"Introduïu el nom d'ordinador que s'hauria d'usar per identificar al servidor."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Activeu esta opció per usar una adreça de remitent personalitzada que "
+"identifiqui al servidor de correu. Si no està activa, s'utilitzarà l'adreça "
+"de la identitat."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Introduïu l'adreça que s'ha d'utilitzar per a substituir l'adreça per "
+"omissió del remitent."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "S'està executant l'orde prèvia"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "S'està executant l'orde prèvia «%1»."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "No s'ha pogut iniciar l'orde prèvia «%1»."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Error en executar l'orde prèvia «%1»."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "L'orde prèvia ha fallat."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "L'orde prèvia ha eixit amb el codi %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Heu de proporcionar un nom d'usuari i una contrasenya per a usar este "
+"servidor SMTP."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "No s'ha pogut crear el treball SMTP."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 núm. %2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Text en clar"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anònim"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"El KWallet no és disponible. Vos recomanem fermament que useu el KWallet per "
+"a gestionar les contrasenyes.\n"
+"Tanmateix, la contrasenya es pot emmagatzemar al fitxer de configuració. La "
+"contrasenya es guarda en un format ofuscat, però no s'hauria de considerar "
+"segur davant d'esforços de desencriptatge si s'obté l'accés al fitxer de "
+"configuració.\n"
+"Voleu guardar la contrasenya pel servidor «%1» en el fitxer de configuració?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "El KWallet no està disponible"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Emmagatzema la contrasenya"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "No emmagatzemes la contrasenya"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "El compte eixint «%1» no està configurat correctament."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Transport per omissió"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Heu de crear un compte eixint abans d'enviar."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Creo un compte ara?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Crea un compte ara"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Configura el compte"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Un servidor SMTP a Internet"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Els transports de correu següents emmagatzemen les contrasenyes en un fitxer "
+"de configuració sense encriptar.\n"
+"Per motius de seguretat considereu la migració d'estes contrasenyes al "
+"KWallet, l'eina de gestió de carteres del KDE, que emmagatzema les dades "
+"sensibles en un fitxer robustament encriptat.\n"
+"Voleu migrar les contrasenyes al KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Pregunta"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Migra"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Conserva"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Primer pas: seleccioneu el tipus de transport"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Nom:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Fes que este siga el compte eixint per omissió."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Seleccioneu un tipus de compte de la llista de baix:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Tipus"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Descripció"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "General"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Informació del compte"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Servidor de &correu d'eixida:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Connexió:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "Contr&asenya:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "La contrasenya a enviar al servidor per l'autorització."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Emmagatzema la contrasenya SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "El servidor &requereix autenticació"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Avançat"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Arranjament de la connexió"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Detecta automàticament"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Este servidor no permet autenticació"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Encriptatge:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "C&ap"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Autenticació:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Arranjament de l'SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "En&via el nom d'ordinador personalitzat al servidor"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "Nom de la &màquina:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Usa una adreça de remitent personalitzada"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Adreça del remitent:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Orde prèvia:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "E&limina"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "&Estableix per omissió"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "A&fig..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Reanomena"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Modifica..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Crea un compte eixint"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Crea i configura"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Error en comprovar les capacitats. Per favor, verifiqueu el port i el mode "
+"d'autenticació."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Ha fallat en comprovar les capacitats"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Este compte eixint no es pot configurar."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Nom"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Tipus"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Omissió)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Voleu eliminar el compte eixint «%1»?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Elimino el compte eixint?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Afig..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Modifica..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Reanomena"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Elimina"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Estableix per omissió"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Missatge buit."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "El missatge no té destinataris."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "El missatge té un transport no vàlid."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "El missatge té una carpeta no vàlida de correu enviat."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "N&om de l'ordinador:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Sendmail local"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Ha fallat en executar el programa de correu %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "El Sendmail ha sortit anormalment."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "El Sendmail ha sortit anormalment: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Una instal·lació local de Sendmail"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "&Ubicació del Sendmail:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "&Servidor de correu:"
diff -Nru kmailtransport-16.12.3/po/cs/kio_smtp.po kmailtransport-17.04.3/po/cs/kio_smtp.po
--- kmailtransport-16.12.3/po/cs/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/cs/kio_smtp.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,229 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Vít Pelčák <vit@pelcak.org>, 2010, 2011, 2015.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2015-07-30 11:15+0100\n"
+"Last-Translator: Vít Pelčák <vit@pelcak.org>\n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: cs\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Lokalize 2.0\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Server odmítl příkazy EHLO i HELO jako neznámé či neimplementované.\n"
+"Prosím kontaktuje systémového správce serveru."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Neočekávaná odezva serveru na příkaz %1:\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Váš SMTP server nepodporuje TLS. Pokud si přejete se připojit bez šifrování, "
+"nejprve zakažte TLS v Ovládacím centru, modul Kryptografie."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Váš SMTP server tvrdí, že podporuje TLS, ale navazování spojení selhalo.\n"
+"TLS můžete zakázat v nastavovacím dialogu účtu SMTP."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Spojení selhalo"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Nastala chyba během ověřování: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Nebyly poskytnuty žádné ověřovací podrobnosti."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Zvolte si jinou ověřovací metodu."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Váš SMTP server nepodporuje %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Váš server SMTP nepodporuje (neurčená metoda)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Váš SMTP server nepodporuje ověření.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Ověření selhalo.\n"
+"Pravděpodobně je chybné heslo.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Nelze přečíst data z aplikace."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Obsah zprávy nebyl přijat.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Server odpověděl:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Server odpověděl: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Toto je pouze dočasná porucha. Můžete to zkusit později."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Aplikace odeslala neplatný dotaz."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Chybí adresa odesilatele."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "Volání SMTPProtocol::smtp_open selhalo (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Váš server (%1) nepodporuje odesílání 8-bitových zpráv.\n"
+"Prosím použijte metodu \"base64\" nebo \"quoted-printable\"."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Zápis do socketu selhal."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Přijata neplatná odpověď (%1) SMTP serveru."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Server (%1) nepřijal spojení.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Uživatelské jméno a heslo vašeho účtu SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Server nepřijal prázdnou adresu odesílatele.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Server nepřijal adresu odesílatele \"%1\".\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Odeslání zprávy selhalo, jelikož tito příjemci byli serverem odmítnuti:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Pokus o zahájení odeslání obsahu zprávy selhal.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Neznámý chybový stav. Prosím zašlete hlášení o chybě."
diff -Nru kmailtransport-16.12.3/po/cs/libmailtransport5.po kmailtransport-17.04.3/po/cs/libmailtransport5.po
--- kmailtransport-16.12.3/po/cs/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/cs/libmailtransport5.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,718 @@
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Lukáš Tinkl <ltinkl@redhat.com>, 2010.
+# Vít Pelčák <vit@pelcak.org>, 2010, 2011, 2012, 2013, 2014, 2015, 2016.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-03-17 15:47+0100\n"
+"Last-Translator: Vít Pelčák <vit@pelcak.org>\n"
+"Language-Team: Czech <kde-i18n-doc@kde.org>\n"
+"Language: en_US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+"X-Generator: Lokalize 2.0\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Unikátní identifikátor"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Jméno přenosu viditelné pro uživatele"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Jméno, které bude použito pro označení tohoto serveru."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Nepojmenovaný"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP server"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Zdroj Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Typ transportu"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Název hostitele serveru"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Doménové jméno nebo IP adresa SMTP serveru."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Číslo portu serveru"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "Číslo portu, na kterém SMTP server naslouchá. Výchozí hodnotou je 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Uživatelské jméno pro přihlášení"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Uživatelské jméno, které bude odesláno na server k autorizaci."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Příkaz ke spuštění před odesláním e-mailu"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Příkaz, který bude proveden před odesláním e-mailu. Může to být využito "
+"například pro vytvoření SSH tunelu. Ponechte prázdné, pokud nemá být "
+"proveden žádný příkaz."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Server vyžaduje ověření"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Zvolte tuto možnost, jestliže server SMTP vyžaduje před přijetím e-mailu "
+"ověření. Tento mechanismus je nazýván ‚Authenticated SMTP‘ nebo ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Uložit heslo"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Zvolte tuto možnost pro uložení hesla.\n"
+"Je-li k disposici KWallet, heslo bude uloženo v ní, což je považováno za "
+"bezpečné.\n"
+"Pokud KWallet k disposici není, heslo bude uloženo v konfiguračním souboru. "
+"Heslo je uloženo v nepřístupném formátu, ale nemůže být považováno za "
+"zabezpečené před dešifrováním, pokud je získán přístup k tomuto souboru."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Metoda šifrování použitá pro komunikaci"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Žádné šifrování"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL šifrování"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS šifrování"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Metoda ověření"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Zvolte tuto možnost pro použití vlastního jména hostitele při identifikaci "
+"se poštovnímu serveru. Je to užitečné v případě, kdy jméno hostitele nemůže "
+"být správně nastaveno nebo pro skrytí skutečného jména hostitele.      "
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+"Vložte jméno hostitele, které má být užito při identifikaci se poštovnímu "
+"serveru."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Zvolte tuto možnost pro použití vlastní adresy odesílatele při identifikaci "
+"k poštovnímu serveru. Při vypnutí je použita adresa z identity."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr "Vložte adresu, která bude použita místo výchozí adresy odesílatele."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Provádím předběžný příkaz"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Provádím předběžný příkaz '%1'"
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Nelze provést předběžný příkaz '%1'."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Chyba při provádění předběžného příkazu '%1'"
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Předběžný příkaz zhavaroval."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Předběžný příkaz skončil s kódem %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Pro přístup k tomuto SMTP serveru musíte zadat uživatelské jméno a heslo."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Nelze vytvořit SMTP úlohu."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Vymazat text"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anonymní"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Neznámý"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet není k dispozici. Silně se doporučuje použít KWallet ke správě "
+"vašich hesel.\n"
+"Nicméně hesla lze uložit do konfiguračního souboru. Heslo je uloženo v "
+"nepřístupném formátu, ale nemělo by být považováno za zabezpečené před "
+"dešifrováním, pokud je získán přístup k tomuto souboru.\n"
+"Přejete si uložit heslo na server '%1' do konfiguračního souboru?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet není k dispozici"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Uložit heslo"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Neukládat heslo"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Odchozí účet \"%1\" není správně nastaven."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Výchozí transport"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Před odesláním musíte vytvořit účet pro odesílání."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Nyní vytvořit účet?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Nyní vytvořit účet"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Nastavení účtu"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "SMTP server na Internetu"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Následující přenosy pošty ukládají hesla v konfiguračním souboru místo "
+"úschovny (KWallet).\n"
+"Z bezpečnostních důvodů se doporučuje použít úschovnu, která ukládá citlivá "
+"data do zašifrovaného úložiště.\n"
+"Přejete si převést hesla do úschovny?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Dotaz"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Převést"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Ponechat"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Krok jedna: Vyberte typ přenosu"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Název:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Nastavit toto jako výchozí odchozí účet."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Ze seznamu níže zvolte typ účtu:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Typ"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Popis"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Obecné"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Informace o účtu"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Server odchozí &pošty:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "Uživate&l:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "&Heslo:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Heslo, které bude odesláno serveru k ověření."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "Uložit heslo &SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Server &vyžaduje ověření"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Pokročilé"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Nastavení připojení"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Automatická detekce"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Tento server nepodporuje ověření"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Šifrování:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Nic"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Ověření:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Nastavení SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Posl&at na server vlastní jméno hostitele"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Použít vlastní adresu odesílatele"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Adresa odesílatele:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Předběžný příkaz:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "O&dstranit"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Na&stavit jako výchozí"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "Při&dat..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "Pře&jmenovat"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "Z&měnit..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Vytvořit odchozí účet"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Vytvořit a nastavit"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Tento odchozí účet nelze nastavit."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Jméno"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Typ"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (výchozí)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Přejete si odstranit odchozí účet '%1'?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Odstranit odchozí účet?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Přidat..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Změnit..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Přejmenovat"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Odstranit"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Nastavit jako výchozí"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Prázdnou zpráva."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Zpráva nemá příjemce."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Zpráva má neplatný transport."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Zpráva má neplatnou složku odeslané pošty."
diff -Nru kmailtransport-16.12.3/po/da/kio_smtp.po kmailtransport-17.04.3/po/da/kio_smtp.po
--- kmailtransport-16.12.3/po/da/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/da/kio_smtp.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,234 @@
+# Danish translation of kio_smtp
+# Copyright (C).
+#
+# Erik Kjær Pedersen <erik@binghamton.edu>, 2002,2003, 2004.
+# Martin Schlander <mschlander@opensuse.org>, 2008, 2009, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-06-04 10:22+0200\n"
+"Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
+"Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Serveren afslog både EHLO- og HELO-kommandoerne som ukendte eller ikke "
+"implementerede.\n"
+"Kontakt venligst serverens systemadministrator."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Uventet serversvar på kommandoen %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Din SMTP-server understøtter ikke TLS. Deaktivér TLS, hvis du ønsker at "
+"forbinde uden kryptering."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Din SMTP-server siger den understøtter TLS men forhandlingen lykkedes ikke.\n"
+"Du kan deaktivere TLS i dialogen med SMTP-kontoindstillinger."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Forbindelse mislykkedes"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "En fejl opstod under godkendelse: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Ikke sørget for godkendelsesdetaljer."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Vælg en anden godkendelsesmetode."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Din SMTP-server understøtter ikke %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Din SMTP-server understøtter ikke (uspecificeret metode)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Din SMTP-server understøtter ikke godkendelse.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Godkendelse mislykkedes.\n"
+"Det er højst sandsynligt adgangskoden der var forkert.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Kunne ikke læse data fra program."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Brevets indhold blev ikke accepteret.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Serveren svarede:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Serveren svarede: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Dette er en midlertidig fejl. Du kan prøve igen senere."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Programmet sendte en ugyldig forespørgsel."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Senderadressen mangler."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open mislykkedes (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Din server (%1) understøtter ikke afsendelse af 8-bit-beskeder.\n"
+"Brug venligst base64 eller quoted-printable indkodning."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Skrivning til kontaktflade fejlede."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Ugyldigt SMTP-svar (%1) modtaget."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Serveren (%1) accepterede ikke forbindelsen.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Brugernavn og adgangskode for din SMTP-konto:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Serveren accepterede ikke senderadressen.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Serveren accepterede ikke senderadressen \"%1\".\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Afsending af besked mislykkedes idet følgende modtagere blev afslået af "
+"serveren:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Forsøget på at begynde at sende brevets indhold mislykkedes.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Ikke håndteret fejlbetingelse. Indsend venligst en fejlrapport."
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "Godkendelsesstøtte er ikke kompileret ind i kio_smtp."
diff -Nru kmailtransport-16.12.3/po/da/libmailtransport5.po kmailtransport-17.04.3/po/da/libmailtransport5.po
--- kmailtransport-16.12.3/po/da/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/da/libmailtransport5.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,808 @@
+# translation of libmailtransport.po to
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Martin Schlander <mschlander@opensuse.org>, 2008, 2009, 2010, 2012, 2013, 2014, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-07-11 21:53+0100\n"
+"Last-Translator: Martin Schlander <mschlander@opensuse.org>\n"
+"Language-Team: Danish <kde-i18n-doc@kde.org>\n"
+"Language: da\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Unik identifikator"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Transportnavn synligt for bruger"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Navnet som vil blive brugt ved henvisning til denne server."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Unavngivet"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP-server"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi-ressource"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Transporttype"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Værtsnavn for serveren"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "SMTP-serverens domænenavn eller numeriske adresse."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Serverens portnummer"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "Portnummeret som SMTP-serveren lytter på. Standardport er 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Brugernavn nødvendigt til login"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Brugernavnet der skal sendes til serveren til godkendelse."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Kommando der skal køres for afsendelse af post"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"En kommando til at køre lokalt for afsendelse af e-mail. Dette kan f.eks. "
+"bruges til at opsætte SSH-tunneller. Lad det være tomt hvis ingen kommando "
+"skal køres.      "
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Serveren kræver godkendelse"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Markér denne indstilling hvis din SMTP-server kræver autentificering før "
+"accept af post. Dette er kendt som \"Authenticated SMTP\" eller ASMTP.      "
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Gem adgangskoden"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Markér denne indstilling for at få gemt din adgangskode. Hvis KWallet er "
+"tilgængelig vil koderordet blive gemt der hvilket betragtes som sikkert.\n"
+"Hvis KWallet ikke er tilgængelig vil adgangskoden dog blive gemt i "
+"konfigurationsfilen. Adgangskoden gemmes i et kompliceret format, men bør "
+"ikke anses for sikkert imod dekrypteringsforsøg hvis adgang til "
+"konfigurationsfilen opnås.      "
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Krypteringsmetode brugt til kommunikation"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Ingen kryptering"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL-kryptering"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS-kryptering"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Godkendelsesmetode"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Markér denne indstilling for at anvende et brugervalgt værtsnavn til "
+"identifikation hos mail-serveren. Dette er nyttigt når dit systems værtsnavn "
+"måske ikke er sat korrekt eller for at maskere dit systems sande "
+"værtsnavn.      "
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Indtast værtsnavnet som skal bruges til identifikation af serveren."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Markér denne indstilling for at anvende en selvvalgt afsenderadresse til "
+"identifikation hos mail-serveren. Hvis dette ikke er markeret bruges "
+"adressen fra identiteten."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Angiv adressen der skal bruges til at overskrive standard afsenderadresssen."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Kører forkommando"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Kører forkommandoen '%1'."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Kunne ikke starte forkommandoen \"%1\"."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Fejl under kørsel af forkommandoen \"%1\"."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Forkommandoen brød sammen."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Forkommandoen afsluttede med koden %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Du skal oplyse et brugernavn og en adgangskode for at bruge denne SMTP-"
+"server."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Kan ikke oprette SMTP-job."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Klartekst"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anonym"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Ukendt"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet er ikke tilgængelig. Det anbefales kraftigt at bruge KWallet til "
+"håndtering af adgangskoder.\n"
+"Adgangskoden kan dog gemmes i konfigurationsfilen i stedet. Adgangskoden "
+"gemmes i et kompliceret format, men det bør ikke anses for sikkert imod "
+"dekrypteringsforsøg hvis adgang til konfigurationsfilen opnås.\n"
+"Vil du gemme adgangskoden til serveren '%1' i konfigurationsfilen?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet ikke tilgængelig"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Gem adgangskoden"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Gem ikke adgangskoden"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Den udgående konto \"%1\" er ikke konfigureret korrekt."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Standardtransport"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Du skal oprette en udgående konto før afsendelse."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Opret en konto nu?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Opret konto nu"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Indstil konto"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "En SMTP-server på internettet"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Følgende posttransporter gemmer deres adgangskode i en ukrypteret "
+"konfigurationsfil.\n"
+"Af sikkerhedsgrunde, anbefales det at flytte disse adgangskoder til KWallet, "
+"KDE's værktøj til tegnebogshåndtering,\n"
+"som gemmer følsomme data for dig i en stærkt krypteret fil.\n"
+"Vil du flytte dine adgangskoder til KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Spørgsmål"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Flyt"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Behold"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Trin 1: Vælg transporttype"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Navn:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Gør denne konto til standard for udgående."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Vælg en kontotype fra listen nedenfor:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Type"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Beskrivelse"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Generelt"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Kontoinformation"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Udgående &mail-server:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Login:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "&Adgangskode:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Adgangskoden der skal sendes til serveren til godkendelse."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Gem SMTP-adgangskoden"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Serveren k&ræver godkendelse"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Avanceret"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Forbindelsesindstillinger"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Autodetektér"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Denne server understøtter ikke godkendelse"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Kryptering:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Ingen"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Autentificering:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP-indstillinger"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Sen&d brugerdefineret værtsnavn til serveren"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "Værts&navn:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Brug selvvalgt afsenderadresse"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Afsenderadresse:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Forkommando:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "Fj&ern"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Sæt som &standard"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "&Tilføj..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Omdøb"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "Æ&ndr..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Opret udgående konto"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Opret og indstil"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Kunne ikke tjekke kapabiliteter. Kontrollér port og autentificeringstilstand."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Tjek af kapabiliteter mislykkedes"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Denne udgående konto kan ikke konfigureres."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Navn"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Type"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Standard)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Vil du fjerne den udgående konto \"%1\"?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Fjern udgående konto?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Tilføj..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Ændr..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Omdøb"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Fjern"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Sæt som standard"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Tomt brev."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Brevet har ingen modtagere."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Brevet har ugyldig transport."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Brevet har ugyldig sendte-e-mails-mappe."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Vær&tsnavn:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Lokal sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Fejl under kørsel af afsenderprogram %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail afsluttede unormalt."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail afsluttede unormalt: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "En lokal installation af sendmail"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "P&lacering af Sendmail:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "Mail-&server:"
+
+#~ msgid "Edit..."
+#~ msgstr "Redigér..."
+
+#~ msgid "text"
+#~ msgstr "tekst"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "Tjek &hvad serveren understøtter"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Godkendelsesmetode"
+
+#~ msgid "&LOGIN"
+#~ msgstr "&LOGIN"
+
+#~ msgid "&PLAIN"
+#~ msgstr "&PLAIN"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "&GSSAPI"
+
+#~ msgid "&NTLM"
+#~ msgstr "&NTLM"
+
+#~ msgid "Transport: Sendmail"
+#~ msgstr "Transport: Sendmail"
+
+#~ msgid "&Location:"
+#~ msgstr "&Placering:"
+
+#~ msgid "Choos&e..."
+#~ msgstr "Væl&g..."
+
+#~ msgid "Transport: SMTP"
+#~ msgstr "Transport: SMTP"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "Use Sendmail"
+#~ msgstr "Brug Sendmail"
+
+#~ msgid "Only local files allowed."
+#~ msgstr "Kun lokale filer tilladt."
+
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "Tilføj transport"
+
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "Ændr transport"
diff -Nru kmailtransport-16.12.3/po/de/docs/kioslave5/smtp/index.docbook kmailtransport-17.04.3/po/de/docs/kioslave5/smtp/index.docbook
--- kmailtransport-16.12.3/po/de/docs/kioslave5/smtp/index.docbook	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/de/docs/kioslave5/smtp/index.docbook	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
+<!ENTITY % addindex "IGNORE">
+<!ENTITY % German "INCLUDE"
+> <!-- change language only here -->
+]>
+	
+<article lang="&language;" id="smtp">
+<title
+>smtp</title>
+<articleinfo>
+<authorgroup>
+<author
+>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"
+><firstname
+>Marco</firstname
+><surname
+>Wegner</surname
+><affiliation
+><address
+><email
+>mail@marcowegner.de</email
+></address
+></affiliation
+><contrib
+>Übersetzer</contrib
+></othercredit
+> 
+</authorgroup>
+</articleinfo>
+<para
+>Ein Protokoll, um Nachrichten (E-Mail) von einem Rechner zu einem E-Mail-Server zu senden. </para>
+
+<para
+>Siehe auch: <ulink url="http://cr.yp.to/smtp.html"
+>Simple Mail Transfer Protocol</ulink
+>. </para>
+
+</article>
diff -Nru kmailtransport-16.12.3/po/de/kio_smtp.po kmailtransport-17.04.3/po/de/kio_smtp.po
--- kmailtransport-16.12.3/po/de/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/de/kio_smtp.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,241 @@
+# Thomas Diehl <thd@kde.org>, 2002, 2003, 2004.
+# Stephan Johach <hunsum@gmx.de>, 2004, 2005.
+# Thomas Reitelbach <tr@erdfunkstelle.de>, 2006, 2007, 2009.
+# Johannes Obermayr <johannesobermayr@gmx.de>, 2010.
+# Frederik Schwarzer <schwarzer@kde.org>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-02-07 04:39+0100\n"
+"Last-Translator: Johannes Obermayr <johannesobermayr@gmx.de>\n"
+"Language-Team: German <kde-i18n-de@kde.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Der Server hat die Befehle EHLO und HELO als unbekannt oder nicht "
+"unterstützt zurückgewiesen.\n"
+"Bitte nehmen Sie Kontakt zum Systemverwalter des Servers auf."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Unerwartete Server-Antwort auf Befehl %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Ihr SMTP-Server unterstützt das TLS-Protokoll nicht. Deaktivieren Sie TLS in "
+"den Systemeinstellungen, falls Sie eine unverschlüsselte Verbindung aufbauen "
+"möchten (Persönliche Einstellungen -> Verschlüsselung)."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Der SMTP-Server unterstützt angeblich das TLS-Protokoll, aber ein "
+"entsprechender Verbindungsversuch ist fehlgeschlagen.\n"
+"Sie können die Verwendung von TLS im Einrichtungsdialog für "
+"Postausgangsserver abschalten."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Verbindung fehlgeschlagen"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Bei der Authentifizierung ist ein Fehler aufgetreten: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Keine Authentifizierungsdetails bereitgestellt."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Bitte wählen Sie eine andere Authentifizierungsmethode."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Ihr SMTP-Server unterstützt %1 nicht."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Ihr SMTP-Server unterstützt (nicht spezifizierte Methode) nicht."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Ihr SMTP-Server unterstützt keine Authentifizierung.\n"
+" %1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Authentifizierung fehlgeschlagen.\n"
+"Wahrscheinlich ist das Passwort nicht korrekt.\n"
+"%1 "
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Daten des anderen Programms nicht lesbar."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Der Inhalt der Nachricht wurde nicht akzeptiert.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Meldung des Servers:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Meldung des Servers: %1"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr ""
+"Das ist ein vorübergehendes Problem. Bitte versuchen Sie es später erneut."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Das Programm sendet eine ungültige Anforderung."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Die Absenderadresse fehlt."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open fehlgeschlagen (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Ihr Server (%1) unterstützt keinen Versand von 8-Bit-kodierten Nachrichten.\n"
+"Bitte verwenden Sie base64 oder quoted-printable als Kodierung."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Schreiben auf den Socket ist fehlgeschlagen."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Ungültige SMTP-Antwort empfangen (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Der Server (%1) lehnt die Verbindungsaufnahme ab.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Benutzername und Passwort für Ihren SMTP-Zugang:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Server akzeptiert keine leere Absenderadresse:\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Der Server akzeptiert die Absenderadresse %1 nicht.\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Mailversand fehlgeschlagen, da die folgende Empfängeradresse vom Server "
+"abgelehnt wurde:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Senden der Nachricht fehlgeschlagen.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr ""
+"Nicht behebbare Fehlersituation. Bitte senden Sie uns einen Fehlerbericht."
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr ""
+#~ "Unterstützung für Authentifizierung wurde beim Kompilieren von kio_smtp "
+#~ "nicht eingebunden."
diff -Nru kmailtransport-16.12.3/po/de/libmailtransport5.po kmailtransport-17.04.3/po/de/libmailtransport5.po
--- kmailtransport-16.12.3/po/de/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/de/libmailtransport5.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,846 @@
+# Stephan Johach <hunsum@gmx.de>, 2007.
+# Thomas Reitelbach <tr@erdfunkstelle.de>, 2007, 2008, 2009.
+# Burkhard Lück <lueck@hube-lueck.de>, 2009, 2010, 2012, 2013.
+# Frederik Schwarzer <schwarzer@kde.org>, 2009, 2010, 2011, 2012, 2013, 2014, 2016.
+# Johannes Obermayr <johannesobermayr@gmx.de>, 2010.
+# Intevation GmbH, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-03-15 21:23+0100\n"
+"Last-Translator: Frederik Schwarzer <schwarzer@kde.org>\n"
+"Language-Team: German <kde-i18n-de@kde.org>\n"
+"Language: de\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Eindeutiger Bezeichner"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Für den Benutzer sichtbarer Name der Versandart"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr ""
+"Der Name, der verwendet wird, wenn auf diesen Server Bezug genommen wird."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Unbenannt"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP-Server"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi-Ressource"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Typ der Versandart"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Rechnername des Servers"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Der Domain-Name oder die numerische Adresse des SMTP-Servers."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Die Port-Nummer des Servers"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"Die Port-Nummer, auf der der SMTP-Server auf Anfragen wartet. Der Standard-"
+"Port ist 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Für die Anmeldung wird ein Benutzername benötigt"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr ""
+"Der Benutzername, der zur Autorisierung an den Server übermittelt wird."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Befehl, der vor dem Versenden der E-Mail ausgeführt wird"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Ein lokal vor dem Versenden der E-Mail ausgeführter Befehl. Hiermit kann zum "
+"Beispiel ein SSH-Tunnel aufgesetzt werden. Wenn kein Befehl ausgeführt "
+"werden soll, lassen Sie dieses Eingabefeld leer."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Server erfordert Authentifizierung"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Markieren Sie diese Einstellung, wenn Ihr SMTP-Server eine Authentifizierung "
+"erfordert, bevor er E-Mails annimmt. Dieses Verfahren ist als „Authenticated "
+"SMTP“ bekannt oder einfach als ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Passwort speichern"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Markieren Sie diese Einstellung, wenn Ihr Passwort gespeichert werden soll.\n"
+"Ist „KWallet“ verfügbar, wird das Passwort dort gespeichert, was als sichere "
+"Methode betrachtet wird.\n"
+"Steht „KWallet“ nicht zur Verfügung, wird das Passwort in der "
+"Einrichtungsdatei abgelegt. Das Passwort wird zwar in verschleierter Form "
+"abgelegt, dies ist aber, falls Zugriff auf die Einrichtungsdatei besteht, "
+"kein sicherer Schutz vor Entschlüsselungsversuchen."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Für die Kommunikation verwendete Verschlüsselungsmethode"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Kein Verschlüsselung"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL-Verschlüsselung"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS-Verschlüsselung"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Anmeldeverfahren"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Markieren Sie diese Einstellung, wenn Sie einen benutzerdefinierten "
+"Rechnernamen für die Identifizierung gegenüber dem Mail-Server angeben "
+"möchten. Dies kann sich als nützlich erweisen, wenn Ihr Rechnername nicht "
+"korrekt gesetzt ist oder Sie den eigentlichen Rechnernamen nicht nach außen "
+"preisgeben möchten."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+"Geben Sie den Rechnernamen ein, der zur Identifizierung beim Server "
+"verwendet werden soll."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Markieren Sie diese Einstellung, wenn Sie eine benutzerdefinierte "
+"Absenderadresse für die Identifizierung gegenüber dem Mail-Server angeben "
+"möchten. Falls diese Einstellung nicht markiert ist, wird die Adresse der "
+"Identität verwendet."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Geben Sie die Adresse ein, die an Stelle der Standard Absenderadresse "
+"verwendet werden soll."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Vorverarbeitungsbefehl wird ausgeführt"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Vorverarbeitungsbefehl „%1“ wird ausgeführt."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Vorverarbeitungsbefehl „%1“ kann nicht ausgeführt werden."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Fehler beim Ausführen des Vorverarbeitungsbefehls „%1“."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Der Vorverarbeitungsbefehl hat sich unerwartet beendet."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Der Vorverarbeitungsbefehl hat sich mit dem Rückgabewert %1 beendet."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Um diesen Server zu verwenden, müssen Sie einen Benutzernamen und ein "
+"Passwort angegeben."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Der SMTP-Auftrag kann nicht erzeugt werden."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Klartext"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anonym"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Unbekannt"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet steht nicht zur Verfügung. Zur Verwaltung Ihrer Passwörter wird "
+"KWallet dringend empfohlen.\n"
+"Stattdessen kann das Passwort in der Einrichtungsdatei abgelegt werden. Das "
+"Passwort wird zwar in verschleierter Form abgelegt, dies ist aber, falls "
+"Zugriff auf die Einrichtungsdatei besteht, kein sicherer Schutz vor "
+"Entschlüsselungsversuchen.\n"
+"Möchten Sie das Passwort für den Server %1 in der Einrichtungsdatei "
+"speichern?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet ist nicht verfügbar"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Passwort speichern"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Passwort nicht speichern"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Der Postausgang „%1“ ist nicht korrekt eingerichtet."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Standard-Versandart"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr ""
+"Sie müssen eine Versandart einrichten, bevor Nachrichten versandt werden "
+"können."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Neuen Zugang jetzt erstellen?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Neuen Zugang erstellen"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Postfach einrichten"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Ein SMTP-Server im Internet"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Die folgenden Versandarten speichern ihre Passwörter in einer "
+"unverschlüsselten Einrichtungsdatei.\n"
+"Importieren Sie die Passwörter aus Sicherheitsgründen bitte in KWallet, die "
+"KDE-Passwortverwaltung,\n"
+"in der für Sie sensible Daten gut verschlüsselt gespeichert werden.\n"
+"Möchten Sie die Passwörter auf die Speicherung in KWallet umstellen?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Frage"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Umstellen"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Beibehalten"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Erster Schritt: Versandart auswählen"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Name:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Diese Versandart als Standard für den Postausgang festlegen"
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Wählen Sie aus der Liste unten einen Zugangs-Typ:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Typ"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Beschreibung"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Allgemein"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Informationen zum Postfach"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Ausgehender Mail&server:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Benutzer:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "&Passwort:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Das zur Autorisierung an den Server übermittelte Passwort."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&SMTP-Passwort speichern"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Server &erfordert Authentifizierung"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Erweiterte Einstellungen"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Verbindungseinstellungen"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Automatisch erkennen"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Dieser Server unterstützt keine Authentifizierung"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Verschlüsselung:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Keine"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Authentifizierung:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP-Einstellungen"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "&Benutzerdefinierten Rechnernamen zum Server senden"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "&Rechnername:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Benutzerdefinierte Absenderadresse verwenden"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Absenderadresse:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Vorverarbeitungsbefehl:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "Ent&fernen"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Als &Standard verwenden"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "Hinz&ufügen ..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Umbenennen"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "Än&dern ..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Versand-Zugang erstellen"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Erstellen und einrichten"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Funktionstest fehlgeschlagen. Geben Sie bitte den Port und die "
+"Authentifizierungsmethode an."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Funktionstest fehlgeschlagen"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Dieser Postausgang kann nicht eingerichtet werden."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Name"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Typ"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Standard)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Möchten Sie den Versand-Zugang „%1“ entfernen?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Versand-Zugang entfernen?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Hinzufügen ..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Ändern ..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Umbenennen"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Entfernen"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Als Standard festlegen"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Leere Nachricht."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Die Nachricht enthält keine Empfänger"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Die Nachricht hat einen ungültigen Transport."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Die Nachricht hat einen ungültigen Ordner für gesendete Nachrichten."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "&Rechnername:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Lokales Sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Das Ausführen des E-Mail-Programms %1 ist fehlgeschlagen"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail hat sich unerwartet beendet."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail hat sich unerwartet beendet: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Eine lokale Sendmail-Installation"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Pfad zu &Sendmail:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "Mail&server:"
+
+#~ msgid "Edit..."
+#~ msgstr "Bearbeiten ..."
+
+#~ msgid "text"
+#~ msgstr "Text"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "&Fähigkeiten des Servers testen"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Anmeldeverfahren"
+
+#~ msgid "&LOGIN"
+#~ msgstr "&LOGIN"
+
+#~ msgid "&PLAIN"
+#~ msgstr "&PLAIN"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "&GSSAPI"
+
+#~ msgid "&NTLM"
+#~ msgstr "&NTLM"
+
+#~ msgid "Message has invalid due date."
+#~ msgstr "Die Nachricht enthält ein ungültiges Fälligkeitsdatum."
+
+#~ msgid "Transport: Sendmail"
+#~ msgstr "Versandart: Sendmail"
+
+#~ msgid "&Location:"
+#~ msgstr "&Adresse:"
+
+#~ msgid "Choos&e..."
+#~ msgstr "Aus&wählen ..."
+
+#~ msgid "Transport: SMTP"
+#~ msgstr "Versandart: SMTP"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "Use Sendmail"
+#~ msgstr "Sendmail verwenden"
+
+#~ msgid "Only local files allowed."
+#~ msgstr "Es sind nur lokale Dateien erlaubt."
+
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "Versandart hinzufügen"
+
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "Versandart bearbeiten"
+
+#~ msgid "SM&TP"
+#~ msgstr "SM&TP"
+
+#~ msgid "&Sendmail"
+#~ msgstr "&Sendmail"
+
+#~ msgid "Add Transport"
+#~ msgstr "Versandart hinzufügen"
+
+#~ msgid "Form"
+#~ msgstr "Formular"
+
+#~ msgid "Default"
+#~ msgstr "Standard"
+
+#~ msgid "Default (%1)"
+#~ msgstr "Standard (%1)"
diff -Nru kmailtransport-16.12.3/po/el/kio_smtp.po kmailtransport-17.04.3/po/el/kio_smtp.po
--- kmailtransport-16.12.3/po/el/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/el/kio_smtp.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,245 @@
+# translation of kio_smtp.po to greek
+# translation of kio_smtp.po to
+# Copyright (C) 2002,2003, 2005, 2007, 2008 Free Software Foundation, Inc.
+#
+# Stergios Dramis <sdramis@egnatia.ee.auth.gr>, 2002-2003.
+# Spiros Georgaras <sngeorgaras@otenet.gr>, 2005, 2007.
+# Spiros Georgaras <sng@hellug.gr>, 2007.
+# Toussis Manolis <manolis@koppermind.homelinux.org>, 2007, 2008.
+# Dimitrios Glentadakis <dglent@gmail.com>, 2012.
+# Stelios <sstavra@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2012-10-25 19:16+0200\n"
+"Last-Translator: Dimitrios Glentadakis <dglent@gmail.com>\n"
+"Language-Team: Greek <kde-i18n-el@kde.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.4\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Ο διακομιστής απέρριψε και τις δύο εντολές EHLO και HELO σαν άγνωστες ή μη "
+"υλοποιημένες.\n"
+"Παρακαλώ επικοινωνήστε με το διαχειριστή του διακομιστή."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Μη αναμενόμενη απόκριση διακομιστή στην εντολή %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Ο διακομιστής SMTP σας δεν υποστηρίζει TLS. Απενεργοποιήσετε το TLS αν "
+"θέλετε να συνδεθείτε χωρίς απόκρυψη."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Ο διακομιστής SMTP σας φαίνεται να υποστηρίζει TLS, αλλά η διαπραγμάτευση "
+"απέτυχε.\n"
+"Μπορείτε να απενεργοποιήσετε το TLS στο διάλογο ρυθμίσεων του SMTP "
+"λογαριασμού."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Η σύνδεση απέτυχε"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Παρουσιάστηκε σφάλμα κατά την ταυτοποίηση: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Δεν δόθηκαν λεπτομέρειες ταυτοποίησης."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Επιλέξτε μια διαφορετική μέθοδο ταυτοποίησης."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Ο διακομιστής SMTP σας δεν υποστηρίζει ταυτοποίηση %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr ""
+"Ο διακομιστής SMTP σας δεν υποστηρίζει ταυτοποίηση (μη καθορισμένη μέθοδο)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Ο διακομιστής SMTP σας δεν υποστηρίζει ταυτοποίηση.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Η ταυτοποίηση απέτυχε.\n"
+"Το πιθανότερο είναι να είναι λάθος ο κωδικός πρόσβασης.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Αδυναμία ανάγνωσης δεδομένων από την εφαρμογή."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Το περιεχόμενο του μηνύματος δεν έγινε αποδεκτό.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Ο διακομιστής απάντησε:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Ο διακομιστής απάντησε: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr ""
+"Αυτή είναι μια προσωρινή αποτυχία. Μπορείτε να ξαναπροσπαθήσετε αργότερα."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Η εφαρμογή έστειλε μια μη έγκυρη αίτηση."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Η διεύθυνση αποστολέα λείπει."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open απέτυχε (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Ο διακομιστής σας (%1) δεν υποστηρίζει την αποστολή μηνυμάτων των 8bit.\n"
+"Παρακαλώ χρησιμοποιήστε κωδικοποίηση base64 η quoted-printable."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Η εγγραφή στην υποδοχή απέτυχε."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Λήψη μη έγκυρης απόκρισης SMTP (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Ο διακομιστής (%1) δεν δέχθηκε τη σύνδεση.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Όνομα χρήστη και κωδικός πρόσβασης για το λογαριασμό SMTP σας:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Ο διακομιστής δεν δέχτηκε μια κενή διεύθυνση αποστολέα.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Ο διακομιστής δεν δέχτηκε τη διεύθυνση αποστολέα «%1».\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Η αποστολή του μηνύματος απέτυχε καθώς οι ακόλουθοι παραλήπτες δεν έγιναν "
+"δεκτοί από το διακομιστή:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Η προσπάθεια εκκίνησης της αποστολής του περιεχομένου του μηνύματος "
+"απέτυχε.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr ""
+"Μη διαχειρίσιμη κατάσταση σφάλματος. Παρακαλώ στείλτε μια αναφορά σφάλματος."
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "Το kio_smtp έχει μεταγλωττιστεί χωρίς υποστήριξη ταυτοποίησης."
diff -Nru kmailtransport-16.12.3/po/el/libmailtransport5.po kmailtransport-17.04.3/po/el/libmailtransport5.po
--- kmailtransport-16.12.3/po/el/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/el/libmailtransport5.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,831 @@
+# translation of libmailtransport.po to Greek
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Spiros Georgaras <sng@hellug.gr>, 2007, 2008.
+# Toussis Manolis <manolis@koppermind.homelinux.org>, 2007, 2008, 2009.
+# Bouklis Panos <panos@echidna-band.com>, 2012.
+# Dimitrios Glentadakis <dglent@gmail.com>, 2012, 2013.
+# Stelios <sstavra@gmail.com>, 2012.
+# Dimitris Kardarakos <dimkard@gmail.com>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2014-04-26 11:13+0300\n"
+"Last-Translator: Dimitris Kardarakos <dimkard@gmail.com>\n"
+"Language-Team: Greek <kde-i18n-el@kde.org>\n"
+"Language: el\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Μοναδικό αναγνωριστικό"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Ορατό όνομα μεταφορέα"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr ""
+"Το όνομα που θα χρησιμοποιηθεί όταν γίνεται αναφορά σε αυτόν το διακομιστή."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Χωρίς όνομα"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "Διακομιστής SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Πόρος Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Τύπος μεταφορέα"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Το όνομα του διακομιστή"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Το όνομα τομέα ή η αριθμητική διεύθυνση του διακομιστή SMTP."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Ο αριθμός θύρας του διακομιστή"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"Ο αριθμός θύρας στον οποίο ακούει ο διακομιστής SMTP. Η προκαθορισμένη θύρα "
+"είναι η 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Το όνομα χρήστη για τη σύνδεση"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Το όνομα χρήστη που θα αποσταλεί στο διακομιστή για εξουσιοδότηση."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Εντολή που θα εκτελεστεί πριν την αποστολή του μηνύματος"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Μία εντολή που θα εκτελεστεί τοπικά, πριν την αποστολή του μηνύματος. Μπορεί "
+"να χρησιμοποιηθεί για τη ρύθμιση SSH tunnels, για παράδειγμα. Αφήστε το κενό "
+"αν δε χρειάζεται να εκτελεστεί κάποια εντολή.      "
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Ο διακομιστής απαιτεί ταυτοποίηση"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Ενεργοποιήστε αυτήν την επιλογή αν ο διακομιστής SMTP απαιτεί ταυτοποίηση "
+"για να αποδεχτεί μηνύματα. Αυτό είναι γνωστό ως 'Authenticated SMTP' ή πιο "
+"απλά ASMTP.      "
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Αποθήκευση κωδικού πρόσβασης"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Ενεργοποιήστε αυτήν την επιλογή για να αποθηκευτεί ο κωδικός πρόσβασής σας.\n"
+"Αν είναι διαθέσιμο το KWallet, ο κωδικός πρόσβασης θα αποθηκευτεί εκεί, "
+"πράγμα που θεωρείται ασφαλές.\n"
+"Αν όμως το KWallet δεν είναι διαθέσιμο, ο κωδικός πρόσβασης θα αποθηκευτεί "
+"στο αρχείο διαμόρφωσης. Ο κωδικός πρόσβασης θα αποθηκευτεί σε κωδικοποιημένη "
+"μορφή, αλλά δε θα πρέπει να θεωρείται ανθεκτική έναντι σε προσπάθειες "
+"αποκωδικοποίησής του, αν κάποιος αποκτήσει πρόσβαση στο αρχείο διαμόρφωσης."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Μέθοδος κωδικοποίησης που θα χρησιμοποιηθεί για την επικοινωνία"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Χωρίς κρυπτογράφηση"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "Κρυπτογράφηση SSL"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "Κρυπτογράφηση TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Μέθοδος ταυτοποίησης"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Ενεργοποιήστε αυτήν την επιλογή για να χρησιμοποιήσετε ένα προσαρμοσμένο "
+"όνομα υπολογιστή κατά την ταυτοποίηση στο διακομιστή αλληλογραφίας. Αυτό "
+"είναι χρήσιμο όταν το όνομα του υπολογιστή σας δεν μπορεί να ρυθμιστεί σωστά "
+"ή αν πρέπει να αποστείλετε ένα διαφορετικό όνομα υπολογιστή.      "
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+"Δώστε το όνομα υπολογιστή που θα χρησιμοποιηθεί κατά την ταυτοποίηση στο "
+"διακομιστή."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Ενεργοποιήστε αυτήν την επιλογή για να χρησιμοποιήσετε μία προσαρμοσμένη "
+"διεύθυνση αποστολέα κατά την ταυτοποίηση στο διακομιστή αλληλογραφίας. Αν "
+"δεν επιλεγεί, θα χρησιμοποιηθεί η διεύθυνση από την ταυτότητα."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Εισάγετε τη διεύθυνση που πρέπει να χρησιμοποιηθεί για να αντικαταστήσει την "
+"προεπιλεγμένη διεύθυνση αποστολέα."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Εκτέλεση προεντολής"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Εκτέλεση της προεντολής '%1'."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Αδύνατη η εκκίνηση της προεντολής '%1'."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Σφάλμα κατά την εκτέλεση της προεντολής '%1'."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Η προεντολή κατέρρευσε."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Η προεντολή τερμάτισε με κωδικό %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Πρέπει να δώσετε όνομα χρήστη και κωδικό πρόσβασης για να χρησιμοποιήσετε "
+"αυτόν το διακομιστή SMTP."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Αδύνατη η δημιουργία μιας εργασίας SMTP."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Καθαρισμός κειμένου"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Ανώνυμος"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Άγνωστος"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"Το KWallet δεν είναι διαθέσιμο. Η χρήση του συστήνεται για τη διαχείριση των "
+"κωδικών πρόσβασής σας.\n"
+"Παρόλα αυτά, ο κωδικός πρόσβασης μπορεί να αποθηκευτεί στο αρχείο "
+"διαμόρφωσης. Ο κωδικός πρόσβασης θα αποθηκευτεί σε κωδικοποιημένη μορφή, "
+"αλλά δε θα πρέπει να θεωρείται ανθεκτική έναντι σε προσπάθειες "
+"αποκωδικοποίησής του, αν κάποιος αποκτήσει πρόσβαση στο αρχείο διαμόρφωσης.\n"
+"Θέλετε να αποθηκεύσετε τον κωδικό πρόσβασης του διακομιστή '%1' στο αρχείο "
+"διαμόρφωσης;"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "Το KWallet δεν είναι διαθέσιμο"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Αποθήκευση κωδικού πρόσβασης"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Μη αποθήκευση κωδικού πρόσβασης"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Ο λογαριασμός εξερχομένων \"%1\" δεν είναι σωστά διαμορφωμένος."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Προκαθορισμένος μεταφορέας"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Πρέπει να ρυθμίσετε ένα λογαριασμό εξερχομένων πριν την αποστολή."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Δημιουργία λογαριασμού τώρα;"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Δημιουργία λογαριασμού τώρα"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Διαμόρφωση λογαριασμού"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Ένα διακομιστής SMTP στο διαδίκτυο"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Οι ακόλουθοι μεταφορείς αλληλογραφίας αποθηκεύουν τους κωδικούς πρόσβασης σε "
+"ένα κρυπτογραφημένο αρχείο διαμόρφωσης.\n"
+"Συνίσταται η χρήση του KWallet για την αποθήκευση κωδικών πρόσβασης για "
+"λόγους ασφαλείας, το εργαλείο διαχείρισης πορτοφολιού του KDE,\n"
+"το οποίο αποθηκεύει ευαίσθητα δεδομένα σε ένα ισχυρά κρυπτογραφημένο "
+"αρχείο.\n"
+"Επιθυμείτε τη μεταφορά των κωδικών πρόσβασής σας στο KWallet;"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Ερώτηση"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Μεταφορά"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Διατήρηση"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Βήμα ένα: Επιλογή τύπου μεταφοράς"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Όνομα:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Να γίνει ο προεπιλεγμένος λογαριασμός εξερχομένων."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Επιλέξτε ένα τύπο λογαριασμού από την παρακάτω λίστα:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Τύπος"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Περιγραφή"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Γενικά"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Πληροφορίες λογαριασμού"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, fuzzy, kde-format
+#| msgid "Outgoing mail &server:"
+msgid "Outgoing &mail server:"
+msgstr "Διακομιστής &εξερχομένων:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "Ό&νομα χρήστη:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "Κ&ωδικός πρόσβασης:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Ο κωδικός πρόσβασης που στέλνεται στο διακομιστή για εξουσιοδότηση."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Αποθήκευση κωδικού πρόσβασης SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Ο διακομιστής απαιτεί &ταυτοποίηση"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Για προχωρημένους"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Ρυθμίσεις σύνδεσης"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Αυτόματος εντοπισμός"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Ο διακομιστής υποστηρίζει ταυτοποίηση"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Κρυπτογράφηση:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Καμία"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Θύρα:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Ταυτοποίηση:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Ρυθμίσεις SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "&Αποστολή προσαρμοσμένου ονόματος υπολογιστή στο διακομιστή"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, fuzzy, kde-format
+#| msgid "&Host:"
+msgid "Hostna&me:"
+msgstr "&Υπολογιστής:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Χρήση προσαρμοσμένης διεύθυνσης αποστολέα"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Διεύθυνση αποστολέα:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Προεντολή:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Αφαίρεση"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "&Ορισμός προεπιλογής"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "Προσ&θήκη..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Μετονομασία"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Τροποποίηση..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Δημιουργία λογαριασμού εξερχομένων"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Δημιουργία και διαμόρφωση"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Ο λογαριασμός εξερχομένων δεν μπορεί να διαμορφωθεί."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Όνομα"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Τύπος"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Προκαθορισμένος)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Θέλετε να αφαιρέσετε το λογαριασμό εξερχομένων '%1';"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Αφαίρεση λογαριασμού εξερχομένων;"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Προσθήκη..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Επεξεργασία..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Μετονομασία"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Αφαίρεση"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Ορισμός προεπιλογής"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Κενό μήνυμα."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Το μήνυμα δεν έχει παραλήπτες."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Το μήνυμα έχει μη έγκυρο μεταφορέα."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Το μήνυμα έχει μη έγκυρο φάκελο απεσταλμένων."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Ό&νομα υπολογιστή:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Τοπικό sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Αποτυχία εκτέλεσης του προγράμματος αλληλογραφίας %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Το sendmail τερμάτισε αντικανονικά."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Το sendmail τερμάτισε αντικανονικά: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Τοπική εγκατάσταση sendmail"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Τοποθεσία του &sendmail:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "Διακομιστής &αλληλογραφίας:"
+
+#~ msgid "Edit..."
+#~ msgstr "Επεξεργασία..."
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "Έλεγχος &για το τι υποστηρίζει ο διακομιστής"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Μέθοδος ταυτοποίησης"
+
+#~ msgid "&LOGIN"
+#~ msgstr "&LOGIN"
+
+#~ msgid "&PLAIN"
+#~ msgstr "&PLAIN"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "&GSSAPI"
+
+#~ msgid "&NTLM"
+#~ msgstr "&NTLM"
+
+#~ msgid "Transport: Sendmail"
+#~ msgstr "Μεταφορέας: Sendmail"
+
+#~ msgid "&Location:"
+#~ msgstr "Τοπο&θεσία:"
+
+#~ msgid "Choos&e..."
+#~ msgstr "&Επιλογή..."
+
+#~ msgid "Transport: SMTP"
+#~ msgstr "Μεταφορέας: SMTP"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "Use Sendmail"
+#~ msgstr "Χρήση του Sendmail"
+
+#~ msgid "Only local files allowed."
+#~ msgstr "Επιτρέπονται μόνο τοπικά αρχεία."
+
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "Προσθήκη μεταφορέα"
+
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "Τροποποίηση μεταφορέα"
+
+#~ msgid "SM&TP"
+#~ msgstr "SM&TP"
+
+#~ msgid "&Sendmail"
+#~ msgstr "&Sendmail"
+
+#~ msgid "Add Transport"
+#~ msgstr "Προσθήκη μεταφορέα"
diff -Nru kmailtransport-16.12.3/po/en_GB/kio_smtp.po kmailtransport-17.04.3/po/en_GB/kio_smtp.po
--- kmailtransport-16.12.3/po/en_GB/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/en_GB/kio_smtp.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,233 @@
+# translation of kio_smtp.po to British English
+# Copyright (C) 2003, 2004 Free Software Foundation, Inc.
+#
+# Malcolm Hunter <malcolm.hunter@gmx.co.uk>, 2003.
+# Andrew Coles <andrew_coles@yahoo.co.uk>, 2004, 2009, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-02-07 19:54+0000\n"
+"Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
+"Language-Team: British English <kde-i18n-doc@kde.org>\n"
+"Language: en_GB\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Unexpected server response to %1 command.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialogue."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Connection Failed"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "An error occurred during authentication: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "No authentication details supplied."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Choose a different authentication method."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Your SMTP server does not support %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Your SMTP server does not support (unspecified method)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Could not read data from application."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"The message content was not accepted.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"The server responded:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "The server responded: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "This is a temporary failure. You may try again later."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "The application sent an invalid request."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "The sender address is missing."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open failed (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Writing to socket failed."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Invalid SMTP response (%1) received."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Username and password for your SMTP account:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"The server did not accept a blank sender address.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Unhandled error condition. Please send a bug report."
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "Authentication support is not compiled into kio_smtp."
diff -Nru kmailtransport-16.12.3/po/en_GB/libmailtransport5.po kmailtransport-17.04.3/po/en_GB/libmailtransport5.po
--- kmailtransport-16.12.3/po/en_GB/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/en_GB/libmailtransport5.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,747 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Steve Allewell <steve.allewell@gmail.com>, 2014, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-04-24 16:24+0100\n"
+"Last-Translator: Steve Allewell <steve.allewell@gmail.com>\n"
+"Language-Team: British English <kde-l10n-en_gb@kde.org>\n"
+"Language: en_GB\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.5\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Unique identifier"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "User-visible transport name"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "The name that will be used when referring to this server."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Unnamed"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP Server"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi Resource"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Transport type"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Host name of the server"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "The domain name or numerical address of the SMTP server."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Port number of the server"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"The port number that the SMTP server is listening on. The default port is 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "User name needed for login"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "The user name to send to the server for authorisation."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Command to execute before sending a mail"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Server requires authentication"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Store password"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Encryption method used for communication"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "No encryption"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL encryption"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS encryption"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Authentication method"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Enter the hostname that should be used when identifying to the server."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Executing precommand"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Executing precommand '%1'."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Unable to start precommand '%1'."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Error while executing precommand '%1'."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "The precommand crashed."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "The precommand exited with code %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr "You need to supply a username and a password to use this SMTP server."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Unable to create SMTP job."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Clear text"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anonymous"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Unknown"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet Not Available"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Store Password"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Do Not Store Password"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "The outgoing account \"%1\" is not correctly configured."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Default Transport"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "You must create an outgoing account before sending."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Create Account Now?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Create Account Now"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Configure account"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "An SMTP server on the Internet"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Question"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Migrate"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Keep"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Step One: Select Transport Type"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Name:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Make this the default outgoing account."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Select an account type from the list below:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Type"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Description"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "General"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Account Information"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Outgoing &mail server:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Login:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "P&assword:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "The password to send to the server for authorisation."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Store SMTP password"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Server &requires authentication"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Advanced"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Connection Settings"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Auto Detect"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "This server does not support authentication"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Encryption:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&None"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Authentication:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP Settings"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Sen&d custom hostname to server"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "Hostna&me:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Use custom sender address"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Sender Address:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Precommand:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "Remo&ve"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "&Set as Default"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "A&dd..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Rename"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Modify..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Create Outgoing Account"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Create and Configure"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Failed to check capabilities. Please verify port and authentication mode."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Check Capabilities Failed"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "This outgoing account cannot be configured."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Name"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Type"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Default)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Do you want to remove outgoing account '%1'?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Remove outgoing account?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Add..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Modify..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Rename"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Remove"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Set as Default"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Empty message."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Message has no recipients."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Message has invalid transport."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Message has invalid sent-mail folder."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Hos&tname:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Local sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Failed to execute mailer program %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail exited abnormally."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail exited abnormally: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "A local sendmail installation"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Sendmail &Location:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "Mail &server:"
diff -Nru kmailtransport-16.12.3/po/eo/kio_smtp.po kmailtransport-17.04.3/po/eo/kio_smtp.po
--- kmailtransport-16.12.3/po/eo/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/eo/kio_smtp.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,288 @@
+# translation of kio_smtp.po to Esperanto
+# Copyright (C) 2004 Free Software Foundation, Inc.
+# Matthias Peick <matthias@peick.de>, 2004.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2004-06-10 23:19+0200\n"
+"Last-Translator: Matthias Peick <matthias@peick.de>\n"
+"Language-Team: Esperanto <eo@li.org>\n"
+"Language: eo\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"La servilo rifuzis ambaŭ komandojn EHLO kaj HELO kiel nekonataj aŭ "
+"neprogramitaj.\n"
+"Kontaku la sistemadministriston de la servilo."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Neatendita servila respondo pri %1-komando.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Via SMTP-servo ne subtenas TLS. Malŝalut TLS, se vi volas konekti sen "
+"ĉifrado."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Via SMTP-servo asertas subteni TLS, sed la marĉandado ne sukcesis.\n"
+"Vi povas malsalti TLS en la KDE-Stircentro per la ĉifromodulo ."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Konekto malsukcesis"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr ""
+
+#: command.cpp:274
+#, fuzzy, kde-format
+msgid "No authentication details supplied."
+msgstr "Neniu kongrua legitimig-metodo troviĝis."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Elektu alian legitimigometodon."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Via SMTP-servilo ne subtenas %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Via SMTP-servilo ne subtenas (nekonata metodo)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Via SMTP-servilo ne subtenas aŭtentokontrolon.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Legitimigo malsukcesis.\n"
+"Plej verŝajne la pasvorto estas malĝusta.\n"
+"La servilo diris: %1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Ne eblas legi datumojn de la aplikaĵo."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"La provo eksendi la mesaĝenhavon malsukcesis.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"La servilo diris:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "La servilo diris: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Tiu estas pasanta eraro. Vi povas reprovi poste."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "La aplikaĵo sendis nevalidan postulon."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "La sendinto-adreso mankas."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "La funkcio SMTPProtocol::smtp_open malsukcesis (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Via servilo (%1) ne subtenas sendi okbitajn mesaĝojn.\n"
+"Uzu enkodon de base64 aŭ quoted-printable."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr ""
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Ricevita nevalida SMTP-respondo (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"La servilo (%1) ne akceptis la konekton.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Salutnomo kaj pasvorto por via SMTP-konto:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"La servilo ne akceptis malplenan sendintadreson:\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"La servilo ne akceptis la sendinto-adreson \"%1\"\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"La mesaĝs sendo ne sukcesis, ĉar la servilo rifuzis la sekvontajn "
+"ricevontojn:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"La provo eksendi la mesaĝenhavon malsukcesis.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Eraro ne laborita. Sendu eraroraporton."
+
+#~ msgid ""
+#~ "Your SMTP server does not support %1.\n"
+#~ "Choose a different authentication method.\n"
+#~ "%2"
+#~ msgstr ""
+#~ "Via SMTP-servilo ne subtenas %1.\n"
+#~ "Elektu alian legitimigometodon.\n"
+#~ "%2"
+
+#~ msgid ""
+#~ "You have requested to authenticate to the server, but the server does not "
+#~ "seem to support authentication.\n"
+#~ "Try disabling authentication entirely."
+#~ msgstr ""
+#~ "Vi postulis aŭtentokontrolon al la servilo, sed la servilo ne saĵnas "
+#~ "subteni aŭtentokontrolon.\n"
+#~ "Provu elŝalti la tutan aŭtentokontrolon."
+
+#~ msgid "When prompted, you ran away."
+#~ msgstr "Kiam invitite, vi forkuris."
+
+#, fuzzy
+#~ msgid ""
+#~ "The server did not accept the recipient \"%1\".\n"
+#~ "%2"
+#~ msgstr "La servilo ne akceptis la konekton: %1"
+
+#, fuzzy
+#~ msgid ""
+#~ "One of the recipients was not accepted.\n"
+#~ "The server responded: \"%1\""
+#~ msgstr ""
+#~ "La provo eksendi la mesaĝenhavon malsukcesis.\n"
+#~ "La servo diris:\n"
+#~ "%1"
+
+#, fuzzy
+#~ msgid "Invalid SMTP response received: \"%1\""
+#~ msgstr "Riceviĝis nevalida SMTP-respondo: %1"
+
+#~ msgid ""
+#~ "The server didn't accept the message content:\n"
+#~ "%1"
+#~ msgstr ""
+#~ "La servo ne akceptis la mesaĝenhavon:\n"
+#~ "%1"
+
+#, fuzzy
+#~ msgid ""
+#~ "The server didn't accept one of the recipients.\n"
+#~ "It said: %1"
+#~ msgstr ""
+#~ "La servo ne akceptis unu el la ricevontoj.\n"
+#~ "Ĝi diris: "
+
+#~ msgid "Could not send to server.\n"
+#~ msgstr "Ne eblis sendi al servilo.\n"
diff -Nru kmailtransport-16.12.3/po/eo/libmailtransport5.po kmailtransport-17.04.3/po/eo/libmailtransport5.po
--- kmailtransport-16.12.3/po/eo/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/eo/libmailtransport5.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,734 @@
+# Translation of libmailtransport into esperanto.
+# Axel Rousseau <axel@esperanto-jeunes.org>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2009-11-15 12:06+0100\n"
+"Last-Translator: Axel Rousseau <axel@esperanto-jeunes.org>\n"
+"Language-Team: esperanto <kde-i18n-eo@kde.org>\n"
+"Language: eo\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: pology\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr ""
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr ""
+
+#: kmailtransport/mailtransport.kcfg:18
+#, fuzzy, kde-format
+#| msgid "&Rename"
+msgid "Unnamed"
+msgstr "&Renomi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, fuzzy, kde-format
+#| msgid "Server:"
+msgid "SMTP Server"
+msgstr "Servilo:"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr ""
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr ""
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr ""
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr ""
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, fuzzy, kde-format
+#| msgid "Store Password"
+msgid "Store password"
+msgstr "Konservi pasvorton"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, fuzzy, kde-format
+#| msgid "Encryption"
+msgid "No encryption"
+msgstr "Ĉifrado"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, fuzzy, kde-format
+#| msgid "Encryption"
+msgid "SSL encryption"
+msgstr "Ĉifrado"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, fuzzy, kde-format
+#| msgid "Encryption"
+msgid "TLS encryption"
+msgstr "Ĉifrado"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, fuzzy, kde-format
+#| msgid "Authentication Method"
+msgid "Authentication method"
+msgstr "Aŭtentigometodo"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr ""
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr ""
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr ""
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr ""
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr ""
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet ne disponebla"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Konservi pasvorton"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Ne konservi pasvorton"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Demando"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Konservi"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Tipo"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Priskribo"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr ""
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Informoj pri Konto"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Uzantonomo:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "&Pasvorto:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, fuzzy, kde-format
+#| msgid "Store Password"
+msgid "&Store SMTP password"
+msgstr "Konservi pasvorton"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr ""
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr ""
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, fuzzy, kde-format
+#| msgid "%1 Settings"
+msgid "Connection Settings"
+msgstr "%1 Agordoj"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, fuzzy, kde-format
+#| msgid "Encryption"
+msgid "Encryption:"
+msgstr "Ĉifrado"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Nenio"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Pordo:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, fuzzy, kde-format
+#| msgid "Authentication Method"
+msgid "Authentication:"
+msgstr "Aŭtentigometodo"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Forigu"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "&Aldoni..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Renomi"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Modifi..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr ""
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr ""
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr ""
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr ""
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, fuzzy, kde-format
+#| msgid "A&dd..."
+msgid "Add..."
+msgstr "&Aldoni..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, fuzzy, kde-format
+#| msgid "&Modify..."
+msgid "Modify..."
+msgstr "&Modifi..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, fuzzy, kde-format
+#| msgid "&Rename"
+msgid "Rename"
+msgstr "&Renomi"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, fuzzy, kde-format
+#| msgid "Remo&ve"
+msgid "Remove"
+msgstr "&Forigu"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr ""
+
+#, fuzzy
+#~| msgctxt "@option sendmail transport"
+#~| msgid "Sendmail"
+#~ msgid "Local sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "text"
+#~ msgstr "teksto"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "Rigardi &kion la servilo subtenas"
+
+#~ msgid "&LOGIN"
+#~ msgstr "&LOGIN"
+
+#~ msgid "&PLAIN"
+#~ msgstr "&PLAIN"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "&GSSAPI"
+
+#~ msgid "&NTLM"
+#~ msgstr "&NTML"
diff -Nru kmailtransport-16.12.3/po/es/docs/kioslave5/smtp/index.docbook kmailtransport-17.04.3/po/es/docs/kioslave5/smtp/index.docbook
--- kmailtransport-16.12.3/po/es/docs/kioslave5/smtp/index.docbook	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/es/docs/kioslave5/smtp/index.docbook	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,55 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
+<!ENTITY % addindex "IGNORE">
+<!ENTITY % Spanish "INCLUDE"
+> <!-- change language only here -->
+]>
+	
+<article lang="&language;" id="smtp">
+<title
+>smtp</title>
+<articleinfo>
+<authorgroup>
+<author
+>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"
+> <firstname
+>Marcos</firstname
+> <surname
+>Fouces Lago</surname
+> <affiliation
+><address
+><email
+>mfouces@yahoo.es</email
+></address
+></affiliation
+> <contrib
+>Traductor</contrib
+> </othercredit
+> <othercredit role="translator"
+><firstname
+>Javier</firstname
+><surname
+>Viñal</surname
+><affiliation
+><address
+><email
+>fjvinal@gmail.com</email
+></address
+></affiliation
+><contrib
+>Traductor</contrib
+></othercredit
+> 
+</authorgroup>
+</articleinfo>
+<para
+>Un protocolo para enviar correo desde la estación de trabajo del cliente al servidor de correo. </para>
+
+<para
+>Consulte: <ulink url="http://cr.yp.to/smtp.html"
+>Protocolo de Transferencia de Correo Sencillo</ulink
+>. </para>
+
+</article>
diff -Nru kmailtransport-16.12.3/po/es/kio_smtp.po kmailtransport-17.04.3/po/es/kio_smtp.po
--- kmailtransport-16.12.3/po/es/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/es/kio_smtp.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,239 @@
+# translation of kio_smtp.po to Español
+# Translation of kio_smtp to Spanish
+# Copyright (C) 2001-2002
+#
+# Pablo de Vicente <vicente@oan.es>, 2001-2002.
+# Jaime Robles <jaime@kde.org>, 2003, 2005.
+# Miguel Revilla Rodríguez <yo@miguelrevilla.com>, 2003.
+# Pablo de Vicente <p.devicente@wanadoo.es>, 2004.
+# Enrique Matias Sanchez (aka Quique) <cronopios@gmail.com>, 2007.
+# Santi <santi@kde-es.org>, 2008.
+# Dario Andres Rodriguez <andresbajotierra@gmail.com>, 2008.
+# Adrián Martínez <sfxgt3@gmail.com>, 2010.
+# Javier Vinal <fjvinal@gmail.com>, 2011, 2012, 2013, 2015, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-01-25 09:21+0100\n"
+"Last-Translator: Javier Vinal <fjvinal@gmail.com>\n"
+"Language-Team: Spanish <l10n-kde-es@kde.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"El servidor ha rechazado las órdenes EHLO y HELO y las trata como "
+"desconocidas o sin implementar.\n"
+"Por favor, póngase en contacto con el administrador del sistema."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Respuesta no esperada del servidor a la orden %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Su servidor SMTP no implementa TLS. Desactive TLS si desea conectarse sin "
+"cifrado."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Su servidor SMTP dice implementar TLS, pero la negociación no tuvo éxito.\n"
+"Puede desactivar TLS en el diálogo de preferencias de la cuenta SMTP."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Conexión fallida"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Se ha producido un error durante la autenticación: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "No se proporcionaron detalles de autenticación."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Elija un método diferente de autenticación."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Su servidor SMTP no implementa %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Su servidor SMTP no implementa (método no especificado)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Su servidor SMTP no implementa autenticación.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Autenticación fallida.\n"
+"Lo más probable es que la contraseña fuera incorrecta.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "No ha sido posible leer los datos de la aplicación."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"El contenido del mensaje no fue aceptado.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Respuesta del servidor:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Respuesta del servidor: «%1»"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Esto es un fallo temporal. Puede intentarlo más tarde."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "La aplicación envió una petición no válida."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Falta la dirección del remitente."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "Falló SMTPProtocol::smtp_open (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Su servidor (%1) no soporta el envío de mensajes con 8 bits.\n"
+"Por favor, use codificación base64 o «quoted-printable»."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "La escritura en el conector ha fallado."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Recibida respuesta SMTP no válida (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"El servidor (%1) no aceptó la conexión.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Nombre de usuario y contraseña de su cuenta SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"El servidor no aceptó una dirección de remitente vacía.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"El servidor no aceptó la dirección del remitente «%1».\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"El envío de mensajes ha fallado porque los siguientes destinatarios fueron "
+"rechazados por el servidor:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"El intento de iniciar el envío del contenido del mensaje ha fallado.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Condición de error desconocida. Por favor, envíe un informe de fallo."
diff -Nru kmailtransport-16.12.3/po/es/libmailtransport5.po kmailtransport-17.04.3/po/es/libmailtransport5.po
--- kmailtransport-16.12.3/po/es/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/es/libmailtransport5.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,741 @@
+# translation of libmailtransport.po to Spanish
+# Translation of libmailtransport to Spanish
+# Copyright (C) 2007, 2009, 2009 This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Santiago Fernández Sancho <santi@kde-es.org>, 2007, 2008.
+# Enrique Matias Sanchez (aka Quique) <cronopios@gmail.com>, 2007.
+# Jaime Robles <jaime@kde.org>, 2008.
+# Eloy Cuadra <ecuadra@eloihr.net>, 2008, 2010.
+# Dario Andres Rodriguez <andresbajotierra@gmail.com>, 2008, 2009.
+# Cristina Yenyxe González García <the.blue.valkyrie@gmail.com>, 2009, 2010.
+# Cristina Yenyxe Gonzalez Garcia <the.blue.valkyrie@gmail.com>, 2009.
+# Adrián Martínez <sfxgt3@gmail.com>, 2010.
+# Javier Vinal <fjvinalgmail.com>, 2011, 2012.
+# Javier Viñal <fjvinal@gmail.com>, 2012, 2013, 2014, 2015, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-03-20 13:19+0100\n"
+"Last-Translator: Javier Vinal <fjvinal@gmail.com>\n"
+"Language-Team: Spanish <l10n-kde-es@kde.org>\n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Identificador único"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Nombre de transporte de visible para el usuario"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "El nombre que se utilizará cuando se haga referencia a este servidor."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Sin nombre"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "Servidor SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Recurso de Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Tipo de transporte"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Nombre de máquina del servidor"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "El nombre del dominio o la dirección numérica del servidor SMTP."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Número de puerto del servidor"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"El número de puerto en el que estará escuchando el servidor SMTP. El puerto "
+"predeterminado es el 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Se necesita un nombre de usuario para identificarse"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "El nombre de usuario a enviar al servidor para la autorización."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Orden a ejecutar antes de enviar un correo"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Una orden para ejecutar localmente antes de enviar el correo electrónico. "
+"Puede utilizarse para configurar túneles SSH, por ejemplo. Déjela en blanco "
+"si no se debe ejecutar ninguna orden."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "El servidor requiere autenticación"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Marque esta opción si su servidor SMTP necesita autenticación antes de "
+"aceptar correo. Es lo que se conoce como «autenticación SMTP» o, "
+"simplemente, ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Guardar contraseña"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Marque esta opción para guardar su contraseña.\n"
+"Si KWallet está disponible, se puede usar para guardar la contraseña, que se "
+"podrá considerar segura.\n"
+"Sin embargo, si KWallet no está disponible, la contraseña se guardará en el "
+"archivo de configuración. La contraseña se guardará en formato oculto, pero "
+"no debería considerarse segura a los esfuerzos de descifrado si se ha "
+"conseguido acceso al archivo de configuración."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Método de cifrado utilizado para la comunicación"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Sin cifrado"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "Cifrado SSL"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "Cifrado TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Método de autenticación"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Marque esta opción para utilizar un nombre de máquina personalizado cuando "
+"se identifique ante el servidor de correo.Es práctico cuando el nombre de "
+"máquina de su sistema no esté configurado correctamente o para enmascarar el "
+"verdadero nombre de máquina de su sistema."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+"Introducir el nombre de máquina que se debe utilizar para identificarse ante "
+"el servidor."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Marque esta opción para utilizar una dirección de remitente personalizada "
+"cuando se identifique ante el servidor de correo. Si no está marcada, se "
+"utilizará la dirección de su identidad."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Introduzca la dirección que sobrescribirá la dirección de remitente "
+"predeterminada."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Ejecutando orden previa"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Ejecutando orden previa «%1»."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "No se pudo iniciar la orden previa «%1»."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Error al ejecutar la orden previa «%1»."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "La orden previa se colgó."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Finalizó la orden previa con el código %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Necesita proporcionar un nombre de usuario y una contraseña para utilizar "
+"este servidor SMTP."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "No es posible crear un trabajo SMTP."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Texto en claro"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anónimo"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Desconocido"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet no está disponible. Es altamente recomendable utilizar KWallet para "
+"gestionar sus contraseñas.\n"
+"Sin embargo, la contraseña puede guardarse en el archivo de configuración. "
+"La contraseña se guardará con un formato de ocultación, pero no puede "
+"considerarse seguro a los esfuerzos de descifrado si se consigue el acceso "
+"al archivo de configuración.\n"
+"¿Realmente desea guardar la contraseña para el servidor «%1» en el archivo "
+"de configuración?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet no está disponible"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Guardar contraseña"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "No guardar contraseña"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "La cuenta de correo saliente «%1» no está correctamente configurada."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Transporte predeterminado"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Debe crear una cuenta saliente antes de realizar un envío."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "¿Crear cuenta ahora?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Crear cuenta ahora"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Configurar cuenta"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Un servidor SMTP en Internet"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Los siguientes transportes de correo almacenan las contraseñas en un archivo "
+"de configuración sin cifrar.\n"
+"Por razones de seguridad, por favor considere migrar estas contraseñas a "
+"KWallet, la herramienta de gestión de carteras de KDE,\n"
+"que almacena datos sensibles en un archivo fuertemente cifrado.\n"
+"¿ Desea migrar sus contraseñas a KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Pregunta"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Migrar"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Saltar"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Primer paso: seleccionar tipo de transporte"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Nombre:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Hacer que esta sea la cuenta saliente por defecto."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Seleccione un tipo de cuenta de la lista inferior:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Tipo"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Descripción"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "General"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Información de la cuenta"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Servidor de co&rreo saliente:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Identificación:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "Contr&aseña:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "La contraseña a enviar al servidor para la autorización."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "Guardar contra&seña SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "El servidor e&xige autenticación"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Avanzada"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Preferencias de conexión"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Autodetectar"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Este servidor no implementa autenticación"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Cifrado:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Ninguno"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Puerto:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Autenticación:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Preferencias SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Enviar nombre &de máquina personalizado al servidor"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "&Nombre del servidor:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Usar dirección de remitente personalizada"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Dirección del remitente:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Orden previa:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Eliminar"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Establecer como &predeterminado"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "Aña&dir..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "Cambiar de nomb&re"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Modificar..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Crear cuenta saliente"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Crear y configurar"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Ha fallado al comprobar las capacidades. Por favor, verifique el puerto y el "
+"modo de autenticación."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "La comprobación de capacidades ha fallado"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Esta cuenta de correo saliente no se puede configurar."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Nombre"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Tipo"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Predeterminado)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "¿Quiere usted eliminar la cuenta saliente «%1»?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "¿Eliminar cuenta saliente?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Añadir..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Modificar..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Cambiar de nombre"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Eliminar"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Poner como predeterminado"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Mensaje vacío."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "El mensaje no tiene destinatarios."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "El mensaje no tiene un transporte no válido."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "El mensaje tiene un carpeta de correo enviado no válida."
diff -Nru kmailtransport-16.12.3/po/et/docs/kioslave5/smtp/index.docbook kmailtransport-17.04.3/po/et/docs/kioslave5/smtp/index.docbook
--- kmailtransport-16.12.3/po/et/docs/kioslave5/smtp/index.docbook	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/et/docs/kioslave5/smtp/index.docbook	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdebx45.dtd" [
+<!ENTITY % addindex "IGNORE">
+<!ENTITY % Estonian  "INCLUDE"
+> <!-- change language only here -->
+]>
+	
+<article lang="&language;" id="smtp">
+<title
+>smtp</title>
+<articleinfo>
+<authorgroup>
+<author
+>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"
+><firstname
+>Marek</firstname
+><surname
+>Laane</surname
+><affiliation
+><address
+><email
+>bald@online.ee</email
+></address
+></affiliation
+><contrib
+>Tõlge eesti keelde</contrib
+></othercredit
+> 
+</authorgroup>
+</articleinfo>
+<para
+>Protokoll meilide saatmiseks kliendi tööjaamast meiliserverile. </para>
+
+<para
+>Vaata internetist: <ulink url="http://cr.yp.to/smtp.html"
+>Simple Mail Transfer Protocol </ulink
+>. </para>
+
+</article>
diff -Nru kmailtransport-16.12.3/po/et/kio_smtp.po kmailtransport-17.04.3/po/et/kio_smtp.po
--- kmailtransport-16.12.3/po/et/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/et/kio_smtp.po	2017-07-11 00:26:19.000000000 +0000
@@ -0,0 +1,235 @@
+# translation of kio_smtp.po to Estonian
+# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
+#
+# Hasso Tepper <hasso@estpak.ee>, 2002.
+# Marek Laane <bald@smail.ee>, 2003-2004,2007-2008, 2009, 2010.
+# Hasso Tepper <hasso@kde.org>, 2005.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-07-05 05:45+0300\n"
+"Last-Translator: Marek Laane <bald@smail.ee>\n"
+"Language-Team: Estonian <kde-et@linux.ee>\n"
+"Language: et\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Server lükkas nii käsu EHLO kui ka käsu HELO tagasi tundmatu või "
+"teostamatuna.\n"
+"Palun võta ühendust serveri administraatoriga."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Ootamatu serveri vastus käsule %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"SMTP serveril puudub TLS tugi. Kui soovid krüpto kasutamiseta ühendust luua, "
+"keela TLS'i kasutamine."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"SMTP server väidab, et tal on TLS toetus, kuid läbirääkimised polnud "
+"edukad.\n"
+"Sa võid TLS toetuse keelata SMTP-konto seadistuste moodulis."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Ühenduse loomine nurjus"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Autentimisel tekkis viga: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Autentimise üksikasju pole antud."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Vali mõni muu autentimise meetod."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Sinu SMTP server ei toeta meetodit %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Sinu SMTP server ei toeta (määramata meetodit)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Sinu SMTP server ei toeta autentimist.\n"
+" %1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Autentimine nurjus.\n"
+"Kõige tõenäolisemalt on parool vale.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Andmete lugemine rakendusest nurjus."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Kirja sisu ei võetud vastu.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Serveri vastus:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Serveri vastus: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "See on ajutine ebaõnn. Proovi hiljem uuesti."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Rakendus saatis vigase soovi."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Saatja aadress puudub."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open nurjus (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Sinu server (%1) ei toeta 8-bitiste kirjade saatmist.\n"
+"Palun kasuta base64 või quoted-printable kodeeringut."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Soklisse kirjutamise nurjus."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Võeti vastu vigane SMTP vastus (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Server (%1) ei aktsepteerinud ühendust.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Sinu SMTP konto kasutajanimi ja parool:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Server ei aktsepteerinud tühja saatja aadressi.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Server ei aktsepteerinud saatja aadressi \"%1\".\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Kirja saatmine nurjus, sest server ei aktsepteerinud järgmisi saajaid:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Kirja sisu saatmise alustamise katse nurjus.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Käsitlematu vea tingimus. Palun anna veast teada."
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "Autentimise toetus ei ole moodulisse kio_smtp kompileeritud."
diff -Nru kmailtransport-16.12.3/po/et/libmailtransport5.po kmailtransport-17.04.3/po/et/libmailtransport5.po
--- kmailtransport-16.12.3/po/et/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/et/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,779 @@
+# translation of libmailtransport.po to Estonian
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Marek Laane <bald@smail.ee>, 2007-2009, 2010, 2012, 2014, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-07-26 20:45+0300\n"
+"Last-Translator: Marek Laane <qiilaq69@gmail.com>\n"
+"Language-Team: Estonian <kde-et@linux.ee>\n"
+"Language: et\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Unikaalne identifikaator"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Kasutajale nähtav nimi"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Nimi, millega viidatakse sellele serverile."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Nimetu"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP server"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi ressurss"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Transpordi tüüp"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Serveri masinanimi"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "SMTP serveri domeeni nimi või numbriline aadress."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Serveri pordinumber"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "Pordi number, mida SMTP server jälgib. Vaikeport on 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Kasutajanimi sisselogimiseks"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Serverile autentimiseks saadetav kasutajanimi."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Enne kirja saatmist käivitatav käsk"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Käsk, mis käivitatakse kohalikult enne kirja saatmist. Seda saab kasutada "
+"näiteks SSH tunneli loomiseks. Kui mingit käsku pole vaja, jäta tühjaks."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Server nõuab autentimist"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Märgi, kui sinu SMTP server nõuab enne kirja aktsepteerimist autentimist. "
+"Seda tuntakse ka nimetuse all 'autenditud SMTP' ehk lihtsalt ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Parool jäetakse meelde"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Märgi, kui soovid, et sinu parool meelde jäetaks.\n"
+"Kui saadaval on KWallet, salvestatakse parool selles. See on päris "
+"turvaline.\n"
+"Kui KWalletit pole saadaval, salvestatakse parool seadistustefailis. Parool "
+"salvestatakse küll hägustatult, aga seda ei tohi saa pidada väga "
+"turvaliseks, sest seadistustefailile võivad teatud pingutusega juurdepääsu "
+"saada ka võõrad."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Suhtlemisel kasutatav krüptimisviis"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Krüptimist ei kasutata"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL krüptimine"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS krüptimine"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Autentimisviis"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "Veel kirjutamata"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Märgi, kui soovid kasutada tuvastamisel e-posti serveris kohandatud "
+"masinanime. See on kasulik juhul, kui sinu süsteemi masinanimi ei ole "
+"määratud korrektselt või kui soovid mingil põhjusel varjata oma süsteemi "
+"tegelikku masinanime."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Sisesta masinanimi, mida kasutada tuvastamisel serveris."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Märgi, kui soovid kasutada tuvastamisel e-posti serveris kohandatud saatja "
+"aadressi. Märkimata jätmisel kasutatakse identiteedis määratud aadressi."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Sisesta aadress, mida kasutada vaikimisi saatja aadressi tühistamiseks."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Eelkäsu käivitamine"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Eelkäsu '%1' käivitamine."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Eelkäsu '%1' käivitamine nurjus."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Viga eelkäsu '%1' täitmisel."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Eelkäsku tabas krahh."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Eelkäsk lõpetas koodiga %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr "Selle SMTP serveri kasutamiseks on vaja kasutajanime ja parooli."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "SMTP töö loomine nurjus."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Lihttekst"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anonüümne"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Tundmatu"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet pole saadaval. Paroolide haldamiseks on väga soovitav kasutada just "
+"KWalletit.\n"
+"Parooli saab siiski salvestada ka seadistustefaili. Parool salvestatakse "
+"küll hägustatult, aga seda ei tohi saa pidada väga turvaliseks, sest "
+"seadistustefailile võivad teatud pingutusega juurdepääsu saada ka võõrad.\n"
+"Kas salvestada serveri '%1' parool seadistustefaili?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet pole saadaval"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Salvesta parool"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Ära salvesta parooli"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Väljuvate kirjade konto \"%1\" ei ole korrektselt seadistatud."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Vaikimisi kirjade saatmise viis"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Enne saatmist tuleb luua väljuvate kirjade konto."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Kas luua konto nüüd?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Loo konto nüüd"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Konto seadistamine"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "SMTP server internetis"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Järgmised kirjade saatmise viisid salvestavad paroolid krüptimata "
+"seadistustefaili.\n"
+"Turvakaalutlustel on soovitav kanda need paroolid üle KDE turvalaeka "
+"haldurisse KWalletit,\n"
+"mis salvestab sinu tundlikud andmed tugevasti krüptitud faili.\n"
+"Kas kanda paroolid üle KWalletisse?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Küsimus"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Kanna üle"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Hoia alles"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Esimene samm: edastamisviisi valimine"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Nimi:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "See on vaikimisi väljuvate kirjade konto."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Vali allolevast nimekirjast konto tüüp:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Tüüp"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Kirjeldus"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Üldine"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Konto teave"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Väljuvate kirjade &server:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Kasutajanimi:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "P&arool:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Serverisse autentimiseks saadetav parool."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "SMTP pa&rooli salvestamine"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Se&rver nõuab autentimist"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Muu"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Ühenduse seadistused"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Automaattuvastus"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "See server ei toeta autentimist"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Krüptimine:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Puudub"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Autentimine:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP seadistused"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Serverisse saa&detakse kohandatud masinanimi"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "&Masinanimi:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Kohandatud saatja aadressi kasutamine"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Saatja aadress:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Eelkäsk:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Eemalda"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Määra &vaikeväärtuseks"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "L&isa..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Muuda nime"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Muuda..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Väljuvate kirjade konto loomine"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Loo ja seadista"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Omaduste kontrollimine nurjus. Palun kontrolli porti ja autentimisviisi."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Omaduste kontrollimine nurjus"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Väljuvate kirjade kontot ei saa seadistada."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Nimi"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Tüüp"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (vaikimisi)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Kas eemaldada väljuvate kirjade konto \"%1\"?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Kas eemaldada väljuvate kirjade konto?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Lisa..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Muuda..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Muuda nime"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Eemalda"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Sea vaikeväärtuseks"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Tühi kiri."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Kirjal pole saajaid."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Kirjal on vale edastamisviis."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Kirjal on vigane saadetud kirjade kaust."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "&Masinanimi:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Kohalik sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Kirjade saatmise rakenduse %1 käivitamine nurjus"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail lõpetas töö ebanormaalselt."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail lõpetas töö ebanormaalselt: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Kohalik sendmail"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Sendmai&li asukoht:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "E-posti &server:"
+
+#~ msgid "Edit..."
+#~ msgstr "Muuda..."
+
+#~ msgid "text"
+#~ msgstr "tekst"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "K&ontrolli, mida server toetab"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Autentimisviis"
+
+#~ msgid "&LOGIN"
+#~ msgstr "&LOGIN"
+
+#~ msgid "&PLAIN"
+#~ msgstr "&PLAIN"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "&GSSAPI"
+
+#~ msgid "&NTLM"
+#~ msgstr "&NTLM"
+
+#~ msgid "Message has invalid due date."
+#~ msgstr "Kirjal on vale tähtaeg."
diff -Nru kmailtransport-16.12.3/po/eu/kio_smtp.po kmailtransport-17.04.3/po/eu/kio_smtp.po
--- kmailtransport-16.12.3/po/eu/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/eu/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,254 @@
+# translation of kio_smtp.po to basque
+# translation of kio_smtp.po to Basque
+# Copyright (C) 2003, 2005, 2006 Free Software Foundation, Inc.
+# Marcos  <marcos@euskalgnu.org>, 2003, 2005, 2006.
+# marcos <marcos@euskalgnu.org>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2006-02-07 16:22+0100\n"
+"Last-Translator: Marcos <marcos@euskalgnu.org>\n"
+"Language-Team: basque <itzulpena@euskalgnu.org>\n"
+"Language: eu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.10.2\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Zerbitzariak bai EHLO bai HELO komandoak ezezagun edo onargaitzat hartu "
+"ditu\n"
+"Kontaktatu sistemaren kudeatzailearkin."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"%1 komandoari ustegabeko erantzuna zerbitzaritik.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Zure SMTP zerbitzariak ez du TLS onartzen. Desgaitu TLS, zifraketarik gabe "
+"konektatu nahi baduzu."
+
+#: command.cpp:197
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your SMTP server claims to support TLS, but negotiation was "
+#| "unsuccessful.\n"
+#| "You can disable TLS in KDE using the crypto settings module."
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Zure SMTP zerbitzariak TLS onartzen duela dio baina negoziazioak huts egin "
+"du.\n"
+"TLS KDEn desgaitu dezakezu crypto ezarpenen modulua erabiliz"
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Konexikoak huts egin du"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr ""
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Ez da autentikazio xehetasunik eman."
+
+#: command.cpp:384
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your SMTP server does not support %1.\n"
+#| "Choose a different authentication method.\n"
+#| "%2"
+msgid "Choose a different authentication method."
+msgstr ""
+"Zure SMTP zerbitzariak ez du %1 onartzen.\n"
+"Aukera ezazu autentifikazio beste metodo bat.\n"
+"%2"
+
+#: command.cpp:386
+#, fuzzy, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr ""
+"Zure SMTP zerbitzariak ez du autentifikazioa onartzen.\n"
+"  %2"
+
+#: command.cpp:387
+#, fuzzy, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr ""
+"Zure SMTP zerbitzariak ez du autentifikazioa onartzen.\n"
+"  %2"
+
+#: command.cpp:391
+#, fuzzy, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Zure SMTP zerbitzariak ez du autentifikazioa onartzen.\n"
+"  %2"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Autentifikazioak huts egin du\n"
+"Ziur aski pasahitza gaizki dagoelako.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Ezin irakurri daturik aplikaziotik"
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Mezuaren edukina ez da onartu.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Zerbitzariak zera erantzun zuen:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Zerbitzariak zera erantzun zuen: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Behin behineko errorea. Saiatu beranduago."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Aplikazioak baliorik gabeko eskakizuna bidali du"
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Igorlearen helbidea falta da."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open-ek huts egin du (%1)"
+
+#: smtp.cpp:223
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your server does not support sending of 8-bit messages.\n"
+#| "Please use base64 or quoted-printable encoding."
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Zure zerbitzariak ez du onartzen 8-biteko mezurik bidaltzea.\n"
+"Erabili base64 edo 'quoted-printable' kodeketak."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr ""
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Jasotako SMTP erantzuna baliogabekoa da. (%1)"
+
+#: smtp.cpp:537
+#, fuzzy, kde-format
+#| msgid ""
+#| "The server did not accept the connection.\n"
+#| "%1"
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Zerbitzariak ez du konexioa onartu:.\n"
+"%1"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Erabiltzaile-izena eta pasahitza zure SMTP konturako:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Zerbitzariak ez du igorlearen helbide hutsik onartu.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Zerbitzariak ez du \"%1\" igorlearen helbidea onartu.\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Mezua bidaltzeak huts egin du, zerbitzariak hurrengo hartzaileak ukatu "
+"dituztelako:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Mezuaren edukina bidaltzeko saiakerak huts egin du.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Errore baldintza ezezaguna. Bidali programaren-errorearen azalpena."
diff -Nru kmailtransport-16.12.3/po/fa/kio_smtp.po kmailtransport-17.04.3/po/fa/kio_smtp.po
--- kmailtransport-16.12.3/po/fa/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/fa/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,259 @@
+# translation of kio_smtp.po to Persian
+# Nazanin Kazemi <kazemi@itland.ir>, 2006, 2007.
+# MaryamSadat Razavi <razavi@itland.ir>, 2006.
+# Tahereh Dadkhahfar <dadkhahfar@itland.ir>, 2006.
+# Nasim Daniarzadeh <daniarzadeh@itland.ir>, 2006.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2007-07-16 16:52+0330\n"
+"Last-Translator: Nazanin Kazemi <kazemi@itland.ir>\n"
+"Language-Team: Persian <kde-i18n-fa@kde.org>\n"
+"Language: fa\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"کارساز هر دو فرمان EHLO و HELO را به عنوان ناشناخته یا پیاده‌سازی نشده رد "
+"کرد.\n"
+"لطفاً، با سرپرست سیستم خود تماس بگیرید."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"پاسخ غیرمنتظره کارساز به فرمان %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"کارساز SMTP شما TLS را پشتیبانی نمی‌کند. اگر می‌خواهید بدون رمزبندی متصل شوید، "
+"TLS را  غیرفعال سازید."
+
+#: command.cpp:197
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your SMTP server claims to support TLS, but negotiation was "
+#| "unsuccessful.\n"
+#| "You can disable TLS in KDE using the crypto settings module."
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"کارساز SMTP شما ادعای پشتیبانی TLS را می‌کند، ولی مذاکره ناموفق بود.\n"
+"می‌توانید با استفاده از پیمانه تنظیمات رمز، TLS را در KDE غیرفعال سازید."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "خرابی در اتصال"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "در هنگام احراز هویت خطایی رخ داد: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "جزئیات احراز هویت، فراهم نشد."
+
+#: command.cpp:384
+#, fuzzy, kde-format
+msgid "Choose a different authentication method."
+msgstr ""
+"کارساز SMTP شما %1 را پشتیبانی نمی‌کند.\n"
+"روش احراز هویت متفاوتی را انتخاب کنید.\n"
+"%2"
+
+#: command.cpp:386
+#, fuzzy, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr ""
+"کارساز SMTP شما احراز هویت را پشتیبانی نمی‌کند.\n"
+"  %1"
+
+#: command.cpp:387
+#, fuzzy, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr ""
+"کارساز SMTP شما احراز هویت را پشتیبانی نمی‌کند.\n"
+"  %1"
+
+#: command.cpp:391
+#, fuzzy, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"کارساز SMTP شما احراز هویت را پشتیبانی نمی‌کند.\n"
+"  %1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"خرابی در احراز هویت.\n"
+"به احتمال زیاد اسم رمز نادرست است.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "نتوانست داده‌ها را از کاربرد بخواند."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"محتوای پیام پذیرفته نشد.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"کارساز پاسخ داد:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "کارساز پاسخ داد: »%1«"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "این یک خرابی موقت است. بعداً دوباره سعی کنید."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "کاربرد، یک درخواست نامعتبر ارسال کرد."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "نشانی فرستنده از دست رفته است."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open خراب شد )%1("
+
+#: smtp.cpp:223
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your server does not support sending of 8-bit messages.\n"
+#| "Please use base64 or quoted-printable encoding."
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"کارساز شما ارسال پیامهای ۸ بیتی را پشتیبانی نمی‌کند.\n"
+"لطفاً، مبنای ۶۴ یا رمزبندی قابل چاپ نقل قول‌شده را استفاده کنید."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "خرابی در نوشتن سوکت."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "پاسخ SMTP نامعتبر )%1( دریافت شد."
+
+#: smtp.cpp:537
+#, fuzzy, kde-format
+#| msgid ""
+#| "The server did not accept the connection.\n"
+#| "%1"
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"کارساز اتصال را نپذیرفت.\n"
+"%1"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "نام کاربر و اسم رمز حساب SMTP شما:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"کارساز، نشانی خالی فرستنده را نپذیرفت.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"کارساز نشانی فرستنده »%1« را نپذیرفت.\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"از آنجا که گیرنده‌های زیر توسط کارساز رد شدند، ارسال پیام خراب شد:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"خرابی در تلاش برای آغاز ارسال محتوای پیام.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "شرایط خطای گردانده‌نشده. لطفاً، یک گزارش خطا ارسال کنید."
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "پشتیبانی احراز هویت در kio_smtp ترجمه نشده است."
+
+#~ msgid ""
+#~ "Your SMTP server does not support %1.\n"
+#~ "Choose a different authentication method.\n"
+#~ "%2"
+#~ msgstr ""
+#~ "کارساز SMTP شما %1 را پشتیبانی نمی‌کند.\n"
+#~ "روش احراز هویت متفاوتی را انتخاب کنید.\n"
+#~ "%2"
diff -Nru kmailtransport-16.12.3/po/fi/kio_smtp.po kmailtransport-17.04.3/po/fi/kio_smtp.po
--- kmailtransport-16.12.3/po/fi/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/fi/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,237 @@
+# Translation of kio_smtp.po to Finnish
+# Copyright © 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# Kim Enkovaara <kim.enkovaara@iki.fi>, 2002, 2003.
+# Tapio Kautto <eleknader@phnet.fi>, 2004.
+# Ilpo Kantonen <ilpo@iki.fi>, 2005.
+# Tommi Nieminen <translator@legisign.org>, 2010, 2012.
+# Copyright © 2010, 2012 This_file_is_part_of_KDE
+#
+# KDE Finnish translation sprint participants:
+# Author: Artnay
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2013-01-20 20:04:10+0000\n"
+"Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
+"Language-Team: Finnish <lokalisointi@lists.coss.fi>\n"
+"Language: fi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 2012-12-01 22:25:18+0000\n"
+"X-Generator: MediaWiki 1.21alpha (963ddae); Translate 2012-11-08\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Palvelin hylkäsi EHLO- ja HELO-komennot tuntemattomina tai "
+"toteuttamattomina.\n"
+"Ota yhteys palvelimen ylläpitäjään."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Odottamaton palvelinvastaus komentoon %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"SMTP-palvelimesi ei tue TLS:ää. Poista TLS käytöstä, jos haluat ottaa "
+"yhteyden ilman salausta."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"SMTP-palvelimesi väittää tukevansa TLS:ää, mutta neuvottelu epäonnistui.\n"
+"Voit poistaa TLS:n käytöstä SMTP-tilin asetuksista."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Yhteys epäonnistui"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Tunnistauduttaessa sattui virhe: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Ei tunnistusmenetelmien yksityiskohtia."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Valitse toinen tunnistautumistapa."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "SMTP-palvelimesi ei tue ominaisuutta %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "SMTP-palvelimesi ei tue (määrittämätöntä menetelmää)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"SMTP palvelimesi ei tue tunnistautumista.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Tunnistus epäonnistui.\n"
+"Todennäköisesti salasana on väärä.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Sovelluksesta ei voitu lukea dataa."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Viestin sisältöä ei hyväksytty.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Palvelin vastasi:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Palvelin vastasi: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Väliaikainen virhetilanne. Yritä myöhemmin uudelleen."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Sovellus lähetti virheellisen pyynnön."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Lähettäjän osoite puuttuu."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open epäonnistui (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Palvelin (%1) ei tue 8-bittisten viestien lähettämistä.\n"
+"Käytä Base64- tai Quoted printable -koodausta."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Pistokkeeseen kirjoittaminen epäonnistui."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Vastaanotettiin virheellinen SMTP-vastaus (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Palvelin (%1) ei hyväksynyt yhteyttä.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "SMTP-tilisi käyttäjätunnus ja salasana:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Palvelin ei hyväksynyt tyhjää lähettäjän osoitetta.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Palvelin ei hyväksynyt lähettäjän osoitetta ”%1”.\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Viestin lähettäminen epäonnistui, koska seuraaville vastaanottajille "
+"lähetetty viesti hylättiin palvelimella:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Viestin sisällön lähetysyritys epäonnistui.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Käsittelemätön virhetilanne. Lähetä virheraportti."
diff -Nru kmailtransport-16.12.3/po/fi/libmailtransport5.po kmailtransport-17.04.3/po/fi/libmailtransport5.po
--- kmailtransport-16.12.3/po/fi/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/fi/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,750 @@
+# Copyright © 2010, 2011, 2012 This_file_is_part_of_KDE
+# This file is distributed under the same license as the kdepimlibs package.
+# Tommi Nieminen <translator@legisign.org>, 2010, 2011, 2016.
+# Lasse Liehu <lasse.liehu@gmail.com>, 2012, 2013, 2014.
+#
+# KDE Finnish translation sprint participants:
+# Author: Artnay
+# Author: Lliehu
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-11-19 15:18+0200\n"
+"Last-Translator: Tommi Nieminen <translator@legisign.org>\n"
+"Language-Team: Finnish <kde-i18n-doc@kde.org>\n"
+"Language: fi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-POT-Import-Date: 2012-12-01 22:25:21+0000\n"
+"X-Generator: Lokalize 2.0\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Ainutkertainen tunniste"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Käyttäjän näkemä välitysnimi"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Tähän palvelimeen viitattaessa käytettävä nimi."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Nimetön"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP-palvelin"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi-resurssi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Lähetystyyppi"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Palvelimen konenimi"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "SMTP-palvelimen aluenimi tai numeerinen osoite."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Palvelimen portti"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "SMTP-palvelimen kuunteleman portin numero. Oletusportti on 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Kirjautumiseen vaaditaan käyttäjätunnus"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Palvelimelle tunnistautumista varten lähetettävä käyttäjätunnus."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Ennen postin lähettämistä suoritettava komento"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Paikallisesti ennen postin lähettämistä ajettava komento. Tätä voi käyttää "
+"esim. SSH-tunneloinnin luomiseen. Jätä tyhjäksi, ellei mitään komentoa "
+"tarvitse käynnistää."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Palvelin vaatii tunnistautumaan"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Valitse tämä, jos SMTP-palvelimesi vaatii tunnistautumaan ennen postin "
+"hyväksymistä. Menetelmä tunnetaan nimellä ”Authenticated SMTP” (ASMTP)."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Tallenna salasana"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Tallenna salasanasi tämän valinnan avulla.\n"
+"Jos KWallet on käytettävissä, salasana tallennetaan siihen, mitä voi pitää "
+"turvallisena.\n"
+"Jos taas KWallet ei ole käytettävissä, salasana tallennetaan "
+"asetustiedostoon. Vaikka tallennusmuoto on sekoitettu, salasana ei ole "
+"turvassa purkuyrityksiltä, jos hyökkääjä pääsee käsiksi asetustiedostoon."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Viestinnässä käytettävä salausmenetelmä"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Ei salausta"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL-salaus"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS-salaus"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Tunnistautumistapa"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Valitse tämä lähettääksesi postipalvelimelle mukautetun konenimen. Tästä on "
+"hyötyä, ellei järjestelmäsi konenimeä ole asetettu oikein tai jos halutaan "
+"piilottaa järjestelmän todellinen konenimi."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Syötä palvelimelle tunnistauduttaessa käytettävä konenimi."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Tämän avulla voit käyttää mukautettua lähettäjäosoitetta postipalvelimeen "
+"tunnistauduttaessa. Ellei tätä ole valittu, käytetään henkilöyteen kuuluvaa "
+"osoitetta."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr "Syötä osoite, jolla lähettäjän oletusosoite korvataan."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Suoritetaan esikomentoa"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Suoritetaan esikomentoa ”%1”."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Esikomentoa ”%1” ei voitu käynnistää."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Virhe suoritettaessa esikomentoa ”%1”."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Esikomento kaatui."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Esikomento päättyi koodiin %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr "Anna käyttäjätunnus ja salasana käyttääksesi tätä SMTP-palvelinta."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "SMTP-tehtävää ei voitu luoda."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 %2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Paljas teksti"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Nimetön"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet ei ole käytettävissä. On hyvin suositeltavaa käyttää KWalletia "
+"salasanojesi hallintaan.\n"
+"Salasana voidaan kuitenkaan tallentaa myös asetustiedostoon. Se tallennetaan "
+"sekoitettuna, mutta sitä ei voi pitää turvattuna purkuyrityksiltä, jos "
+"jollakulla on pääsy asetustiedostoon.\n"
+"Haluatko tallentaa palvelimen ”%1” salasanan asetustiedostoon?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet ei ole käytettävissä"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Tallenna salasana"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Älä tallenna salasanaa"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Lähetystilin ”%1” asetuksia ei voi muokata."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Oletusvälitys"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Ennen lähettämistä sinun on luotava lähtevä tili."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Luodaanko tili nyt?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Luo tili nyt"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Tilin asetukset"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "SMTP-palvelin internetissä"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Seuraavat lähetystavat tallentavat salasanat salaamattomana "
+"asetustiedostoon.\n"
+"Harkitse turvallisuussyistä näiden salasanojen siirtämistä KWalletiin, KDE:n "
+"lompakonhallintaan,\n"
+"joka tallentaa yksityiset tietosi vahvasti salattuun tiedostoon.\n"
+"Haluatko siirtää salasanasi KWalletiin?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Kysymys"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Siirrä"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Pidä"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Ensimmäinen askel: Valitse lähetystyyppi"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Nimi:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Tee tästä oletuslähetystilisi."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Valitse tilin tyyppi alla olevasta luettelosta:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Tyyppi"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Kuvaus"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Yleistä"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Tilin tiedot"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "&Lähtevän postin palvelin:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Tunnus:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "&Salasana:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Palvelimelle tunnistautumista varten lähetettävä salasana."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Tallenna SMTP-salasana"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Palvelin &vaatii tunnistautumaan"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Lisäasetukset"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Yhteysasetukset"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Tunnista automaattisesti"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Tämä palvelin ei tue tunnistautumista"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Salaus:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Ei mitään"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Portti:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Tunnistautuminen"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP-asetukset"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "&Lähetä palvelimelle eri konenimi"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "&Verkkonimi:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Käytä mukautettua lähettäjäosoitetta"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Lähettäjäosoite:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Esikomento:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "P&oista"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "&Aseta oletukseksi"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "&Lisää…"
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Muuta nimeä"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Muuta…"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Luo lähtevä tili"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Luo ja määritä"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Ominaisuuksien tarkistaminen epäonnistui. Tarkista portti ja "
+"tunnistautumistapa."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Ominaisuuksien tarkistaminen epäonnistui"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Tämän lähetystilin asetuksia ei voi muokata."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Nimi"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Tyyppi"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (oletus)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Haluatko poistaa lähtevän tilin %1?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Poistetaanko lähtevä tili?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Lisää…"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Muuta…"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Muuta nimeä"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Poista"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Aseta oletukseksi"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Tyhjä viesti."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Viestillä ei ole vastaanottajia."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Viestillä on virheellinen lähetystapa."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Viestillä on virheellinen lähtevän postin kansio."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "&Konenimi:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Paikallinen sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Postiohjelmaa %1 ei voitu suorittaa"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail päättyi virheeseen."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail päättyi virheeseen: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Paikallisen sendmailin asennus"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Sen&dmailin sijainti:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "&Postipalvelin:"
diff -Nru kmailtransport-16.12.3/po/fr/kio_smtp.po kmailtransport-17.04.3/po/fr/kio_smtp.po
--- kmailtransport-16.12.3/po/fr/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/fr/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,250 @@
+# translation of kio_smtp.po to Français
+# traduction de kio_smtp.po en Français
+# translation of kio_smtp.po to
+# translation of kio_smtp.po to
+# translation of kio_smtp.po to
+# translation of kio_smtp.po to
+# translation of kio_smtp.po to
+# translation of kio_smtp.po to
+# translation of kio_smtp.po to
+# Copyright (C) 2002,2003, 2004, 2007, 2008 Free Software Foundation, Inc.
+# Matthieu Robin <kde@macolu.org>, 2002,2003, 2004.
+# Gilles CAULIER <caulier.gilles@free.fr>, 2003.
+# Matthieu Robin <kde@macolu.org>, 2004.
+# Sébastien Renard <Sebastien.Renard@digitalfox.org>, 2007, 2008.
+# Sebastien Renard <Sebastien.Renard@digitalfox.org>, 2009.
+# Sébastien Renard <renard@kde.org>, 2010.
+# xavier <xavier.besnard@neuf.fr>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2013-06-07 11:28+0200\n"
+"Last-Translator: xavier <xavier.besnard@neuf.fr>\n"
+"Language-Team: French <kde-i18n-doc@kde.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Lokalize 1.5\n"
+"X-Environment: kde\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Le serveur a rejeté les commandes « EHLO » et « HELO » en indiquant qu'elles "
+"sont inconnues ou non implémentées.\n"
+"Veuillez contacter l'administrateur système du serveur."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Réponse inattendue du serveur à la commande « %1 ».\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Votre serveur SMTP ne gère pas « TLS ». Désactivez « TLS » si vous voulez "
+"pouvoir vous connecter sans chiffrement."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Votre serveur SMTP prétend gérer « TLS » mais la communication n'a pas "
+"abouti.\n"
+"Vous pouvez désactiver « TLS » dans la boîte de dialogue de configuration de "
+"votre compte SMTP."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "La connexion a échoué"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Une erreur s'est produite lors de l'authentification : %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Aucun paramètre fourni d'authentification."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Sélectionnez une autre méthode d'authentification."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Votre serveur SMTP ne gère pas %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Votre serveur SMTP ne gère pas cela (méthode inconnue)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Votre serveur SMTP ne gère pas l'authentification.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Identification impossible.\n"
+"Votre mot de passe est probablement incorrect.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Impossible de lire des données depuis une application."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Le contenu du message n'a pas été accepté.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Le serveur a répondu :\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Le serveur a répondu : « %1 »"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Il s'agit d'une erreur provisoire. Vous devriez réessayer plus tard."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "L'application a envoyé une requête non valable."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "L'adresse de l'expéditeur est manquante."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "La fonction « SMTPProtocol::smtp_open » a échoué (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Votre serveur (%1) ne prend pas en charge l'envoi de messages sur 8 bits.\n"
+"Veuillez utiliser l'encodage du type « base64 » ou « quoted printable »."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Erreur lors de l'écriture sur la socket."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Réponse SMTP reçue (%1) non valable."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Le serveur (%1) a rejeté la connexion.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Nom d'utilisateur et mot de passe de votre compte SMTP :"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Le serveur n'accepte pas une adresse d'expéditeur vide.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Le serveur a rejeté l'adresse de l'expéditeur « %1 ».\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"L'envoi du message a échoué car le serveur a rejeté les destinataires "
+"suivants :\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Impossible de démarrer l'envoi du contenu du message.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr ""
+"Condition d'erreur non prise en charge. Veuillez envoyer un rapport de bogue."
diff -Nru kmailtransport-16.12.3/po/fr/libmailtransport5.po kmailtransport-17.04.3/po/fr/libmailtransport5.po
--- kmailtransport-16.12.3/po/fr/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/fr/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,834 @@
+# translation of libmailtransport.po to
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+# Bruno Patri <bruno.patri@gmail.com>, 2007, 2008, 2009, 2010, 2012, 2013.
+# Sébastien Renard <Sebastien.Renard@digitalfox.org>, 2008.
+# Sebastien Renard <Sebastien.Renard@Solucom.fr>, 2009.
+# xavier <xavier.besnard@neuf.fr>, 2013.
+# Maxime Corteel <mcorteel@gmail.com>, 2015.
+# Vincent Pinon <vpinon@kde.org>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2017-05-10 17:50+0100\n"
+"Last-Translator: Vincent Pinon <vpinon@kde.org>\n"
+"Language-Team: French <kde-francophone@kde.org>\n"
+"Language: fr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Lokalize 2.0\n"
+"X-Environment: kde\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Identifiant unique"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Nom du transport visible par l'utilisateur"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Le nom qui sera utilisé lors d'une référence à ce serveur."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Sans nom"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "Serveur SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Ressource Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Type de transport"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Nom d'hôte du serveur"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Le nom de domaine ou l'adresse numérique du serveur SMTP."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Numéro de port du serveur"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"Le numéro de port sur lequel le serveur SMTP est en écoute. Le numéro de "
+"port par défaut est 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Nom d'utilisateur requis pour la connexion"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Le nom d'utilisateur à envoyer au serveur pour autorisation."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Commande à exécuter avant l'envoi d'un courrier électronique"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Une commande à exécuter localement avant l'envoi d'un courrier électronique. "
+"Ceci peut être utilisé pour établir un tunnel SSH, par exemple. Laissez-le "
+"vide si aucune commande ne doit être exécutée."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Le serveur exige une authentification"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Sélectionnez cette option si votre serveur SMTP exige une authentification "
+"pour accepter l'envoi de courriers électroniques. Ceci s'appelle « SMTP "
+"Authentifié » ou plus simplement « ASMTP »."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Enregistrer le mot de passe"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Sélectionnez cette option pour enregistrer votre mot de passe.\n"
+"Si KWallet est disponible, le mot de passe y sera stocké, ce qui est "
+"considéré comme une méthode sûre.\n"
+"Cependant, si KWallet n'est pas disponible, le mot de passe sera enregistré "
+"dans le fichier de configuration.\n"
+"Le mot de passe n'est pas enregistré en clair, mais cela ne doit pas être "
+"considéré comme sûr vis-à-vis de tentatives de déchiffrement si un accès au "
+"fichier de configuration est obtenu."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Méthode de chiffrement utilisée pour la communication"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Aucun chiffrement"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "Chiffrement « SSL »"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "Chiffrement « TLS »"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Méthode d'authentification"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Sélectionnez cette option pour utiliser un nom d'hôte personnalisé lors de "
+"l'identification sur le serveur de courriers électroniques. C'est utile si "
+"le nom d'hôte de votre système n'est pas correctement défini ou pour masquer "
+"le nom réel de l'hôte du système."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+"Saisissez le nom d'hôte qui devrait être utilisé lors de l'identification "
+"sur le serveur."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Sélectionnez cette option pour utiliser une adresse d'expéditeur "
+"personnalisée lors de l'identification sur le serveur de courriers "
+"électroniques. Si l'option n'est pas sélectionnée, l'adresse de l'identité "
+"est utilisée."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Saisissez l'adresse qui devrait être utilisée à la place de l'adresse "
+"d'expéditeur par défaut."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Exécution de la pré commande"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Exécution de la pré commande « %1 »."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Impossible d'exécuter la pré commande « %1 » :"
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Erreur lors de l'exécution de la pré commande « %1 »."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "La pré commande s'est interrompue brutalement."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "La pré commande s'est terminée avec le code %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Vous devez fournir un nom d'utilisateur et un mot de passe pour utiliser ce "
+"serveur SMTP."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Impossible de créer une tâche SMTP."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Texte en clair"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anonyme"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Inconnu"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet n'est pas disponible. Il est fortement recommandé d'utiliser KWallet "
+"pour gérer vos mots de passe.\n"
+"Cependant, le mot de passe peut être enregistré dans le fichier de "
+"configuration. Il n'est pas stocké en clair, mais cela ne doit pas être "
+"considéré comme sûr vis-à-vis des tentatives de déchiffrement si un accès au "
+"fichier de configuration est obtenu.\n"
+"Voulez-vous enregistrer le mot de passe pour le serveur %1 dans le fichier "
+"de configuration ?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet n'est pas disponible"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Enregistrer le mot de passe"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Ne pas enregistrer le mot de passe"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Le compte d'envoi « %1 » n'est pas correctement configuré."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Transport par défaut"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Vous devez créer un compte d'envoi avant un envoi."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Créer le compte maintenant ?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Créer le compte maintenant"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Configurer le compte"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Un serveur SMTP sur Internet"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Les transports suivants de courriers électroniques enregistrent les mots de "
+"passe dans un fichier non chiffré (en clair).\n"
+"Pour des raisons de sécurité, vous devriez envisager de déplacer ces mots de "
+"passe vers KWallet, le gestionnaire de portefeuille de KDE,\n"
+"qui conserve les données sensibles dans un fichier au chiffrement robuste.\n"
+"Voulez-vous déplacer vos mots de passe vers KWallet ?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Question"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Migrer"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Conserver"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Étape 1 : sélectionnez le type de transport"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Nom :"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "En faire le compte d'envoi par défaut."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Sélectionner un type de compte dans la liste ci-dessous :"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Type"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Description"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Général"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Informations sur le compte"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Serveur d'envoi de &courriers électroniques :"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Utilisateur :"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "Mot de p&asse :"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Le mot de passe à envoyer au serveur pour autorisation."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "Enregi&strer le mot de passe SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Le serveu&r exige une authentification"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Avancé"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Configuration de la connexion"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Détection automatique"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Ce serveur ne prend pas en charge l'authentification"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Chiffrement :"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "Aucu&n"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port :"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Authentification :"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Configuration SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Envoyer un nom &d'hôte personnalisé au serveur"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "&Nom d'hôte :"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Utiliser une adresse personnalisée d'expéditeur"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Adresse d'expéditeur :"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Pré commande :"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Supprimer"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Dé&finir comme réglage par défaut"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "&Ajouter..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Renommer :"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Modifier..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Créer un compte d'envoi"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Créer et configurer"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Erreur lors de la vérification des capacités. Veuillez vérifier le port et "
+"le mode d'authentification."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "La vérification des capacités a échoué"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Impossible de configurer le compte d'envoi."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Nom"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Type"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (par défaut)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Voulez-vous supprimer le compte d'envoi « %1 » ?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Supprimer le compte d'envoi ?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Ajouter..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Modifier..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Renommer"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Supprimer"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Définir comme réglage par défaut"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Message vide."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Le message n'a aucun destinataire."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Le serveur d'envoi du message n'est pas valable."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Le dossier de messages envoyés n'est pas valable."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Nom d'hô&te :"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Logiciel local « Sendmail »"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Échec de l'exécution du programme de courrier électronique %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Le logiciel « Sendmail » s'est interrompu anormalement."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Le logiciel « Sendmail » s'est interrompu anormalement : %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Une installation locale du logiciel « Sendmail »"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Emplacement du &logiciel « Sendmail » :"
+
+#~ msgid "Mail &server:"
+#~ msgstr "&Serveur de courrier électronique :"
+
+#~ msgid "text"
+#~ msgstr "texte"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "&Vérifier ce que le serveur prend en charge"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Méthode d'authentification"
+
+#~ msgid "&LOGIN"
+#~ msgstr "&LOGIN"
+
+#~ msgid "&PLAIN"
+#~ msgstr "&PLAIN"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "&GSSAPI"
+
+#~ msgid "&NTLM"
+#~ msgstr "&NTLM"
+
+#~ msgid "Transport: Sendmail"
+#~ msgstr "Transport : Sendmail"
+
+#~ msgid "&Location:"
+#~ msgstr "Emp&lacement :"
+
+#~ msgid "Choos&e..."
+#~ msgstr "Choi&sir..."
+
+#~ msgid "Transport: SMTP"
+#~ msgstr "Transport : SMTP"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "Use Sendmail"
+#~ msgstr "Utiliser Sendmail"
+
+#~ msgid "Only local files allowed."
+#~ msgstr "Seuls les fichiers locaux sont autorisés."
+
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "Ajouter un transport"
+
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "Modifier un transport"
+
+#~ msgid "SM&TP"
+#~ msgstr "SM&TP"
+
+#~ msgid "&Sendmail"
+#~ msgstr "&Sendmail"
+
+#~ msgid "Add Transport"
+#~ msgstr "Ajouter un transport"
diff -Nru kmailtransport-16.12.3/po/ga/kio_smtp.po kmailtransport-17.04.3/po/ga/kio_smtp.po
--- kmailtransport-16.12.3/po/ga/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ga/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,236 @@
+# translation of kio_smtp.po to Irish
+# Copyright (C) 2002 Free Software Foundation, Inc.
+# Séamus Ó Ciardhuáin <seoc@cnds.ucd.ie>, 2002
+# Kevin Scannell <kscanne@gmail.com>, 2009
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2004-12-03 14:52-0500\n"
+"Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
+"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
+"Language: ga\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.0beta1\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n < 11 ? "
+"3 : 4\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Dhiúltaigh an freastalaí na horduithe EHLO agus HELO de bhrí nach bhfuil "
+"siad ar fáil.\n"
+"Téigh i dteagmháil le riarthóir an fhreastalaí."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Freagra gan súil leis ón bhfreastalaí ar ordú %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Ní thacaíonn do fhreastalaí SMTP le TLS. Díchumasaigh TLS más mian leat "
+"ceangal neamhchriptithe a bhunú."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Maíonn do fhreastalaí SMTP go dtacaíonn sé le TLS, ach níor éirigh leis an "
+"gcaibidlíocht.\n"
+"Is féidir leat TLS a dhíchumasú trí na socruithe cuntais SMTP."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Theip ar Cheangal"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Tharla earráid le linn fíordheimhnithe: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Níor soláthraíodh mionsonraí fíordheimhnithe."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Roghnaigh modh fíordheimhnithe eile."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Ní thacaíonn do fhreastalaí SMTP le %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Ní thacaíonn do fhreastalaí SMTP le (modh gan sonrú)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Ní thacaíonn do fhreastalaí SMTP le fíordheimhniú.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Theip ar fhíordheimhniú.\n"
+"Is dócha go bhfuil an focal faire mícheart.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Níorbh fhéidir sonraí a léamh ón fheidhmchlár."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Níor glacadh le hinneachar na teachtaireachta.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"D'fhreagair an freastalaí:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "D'fhreagair an freastalaí: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr ""
+"Fadhb shealadach é seo. B'fhéidir leat iarracht a dhéanamh níos déanaí."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Seoladh an feidhmchlár iarratas neamhbhailí."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Tá seoladh an tseoltóra ar iarraidh."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "Theip ar SMTPProtocol::smtp_open (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Ní féidir le do fhreastalaí (%1) teachtaireachtaí 8-giotán a sheoladh.\n"
+"Úsáid ionchódú base64 nó quoted-printable."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Ní féidir scríobh chuig soicéad."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Fuarthas freagra neamhbhailí SMTP (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Níor ghlac an freastalaí (%1) leis an gceangal.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Ainm úsáideora agus focal faire do do chuntas SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Níor ghlac an freastalaí le seoladh folamh seoltóra.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Níor ghlac an freastalaí le seoladh seoltóra \"%1\".\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Níorbh fhéidir an teachtaireacht a sheoladh toisc gur dhiúltaigh an "
+"freastalaí na faighteoirí seo a leanas:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Theip ar iarracht inneachar na teachtaireachta a sheoladh.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Earráid gan láimhseáil. Seol tuairisc ar fhabht."
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "Níor cuireadh fíordheimhniú isteach i kio_smtp ag am tiomsaithe."
diff -Nru kmailtransport-16.12.3/po/ga/libmailtransport5.po kmailtransport-17.04.3/po/ga/libmailtransport5.po
--- kmailtransport-16.12.3/po/ga/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ga/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,836 @@
+# Irish translation of libmailtransport
+# Copyright (C) 2009 This_file_is_part_of_KDE
+# This file is distributed under the same license as the libmailtransport package.
+# Kevin Scannell <kscanne@gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: kdepimlibs/libmailtransport.po\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2007-06-27 10:27-0500\n"
+"Last-Translator: Kevin Scannell <kscanne@gmail.com>\n"
+"Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
+"Language: ga\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n < 11 ? "
+"3 : 4\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Aitheantóir uathúil"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Ainm iompair infheicthe ag an úsáideoir"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Ainm a úsáidfear nuair a dhéanfar tagairt don fhreastalaí seo."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Gan ainm"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "Freastalaí SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Acmhainn Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Mód iompair"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Óstainm an fhreastalaí"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Ainm an fhearainn nó seoladh uimhriúil an fhreastalaí SMTP."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Uimhir phoirt an fhreastalaí"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"Uimhir an phoirt a n-éisteann an freastalaí SMTP leis. Is é port 25 an port "
+"réamhshocraithe."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Ainm úsáideora de dhíth chun logáil isteach"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Ainm úsáideora le seoladh chuig an bhfreastalaí le haghaidh údaraithe."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Ordú le rith sula seoltar teachtaireacht ríomhphoist"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Ordú le rith go logánta, sula seoltar ríomhphost. Is féidir é seo a úsáid "
+"chun tollán SSH a shocrú, mar shampla. Fág é bán mura bhfuil ordú le rith."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Fíordheimhniú de dhíth ar an bhfreastalaí"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Cuir tic leis an rogha seo má éilíonn do fhreastalaí SMTP fíordheimhniú sula "
+"nglacfaidh sé le ríomhphost. Tugtar 'Authenticated SMTP' (SMTP "
+"fíordheimhnithe) nó 'ASMTP'."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Sábháil an focal faire"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Cuir tic leis an rogha seo chun d'fhocal faire a stóráil.\n"
+"Má tá KWallet ar fáil, stórálfar an focal faire ann, áit a meastar a bheith "
+"slán.\n"
+"Mura bhfuil KWallet ar fáil, stórálfar an focal faire i gcomhad cumraíochta. "
+"Stórálfar an focal faire i bhformáid scrofa, ach dá bhfaigheadh duine éigin "
+"rochtain ar an gcomhad, is dócha go mbeadh sé in ann é a dhíchriptiú."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Modh criptiú a úsáidtear le haghaidh cumarsáide"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Gan chriptiú"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "Criptiú SSL"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "Criptiú TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Modh fíordheimhnithe"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- LE DÉANAMH -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Cuir tic leis an rogha seo chun óstainm saincheaptha a úsáid agus do féin a "
+"chur in iúl don fhreastalaí ríomhphoist. Rogha áisiúil é seo nuair nach "
+"bhfuil ainm do chóras socraithe mar is ceart, nó más mian leat fíorainm do "
+"chórais a choinneáil faoi cheilt."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+"Iontráil an t-óstainm is mian leat a úsáid agus do chóras á chur in iúl don "
+"fhreastalaí."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Cuir tic leis an rogha seo chun seoladh saincheaptha a úsáid agus thú féin a "
+"chur in iúl don fhreastalaí ríomhphoist. Mura bhfuil tic leis, úsáidfear an "
+"seoladh ón aitheantas."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Cuir isteach an seoladh is mian leat a úsáid in ionad sheoladh "
+"réamhshocraithe an tseoltóra."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Réamhordú á rith"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Réamhordú '%1' á rith."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Níorbh fhéidir réamhordú '%1' a thosú."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Earráid agus réamhordú '%1' á rith."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Thuairteáil an réamhordú."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Stop an réamhordú le stádas scortha %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Is gá ainm úsáideora agus focal faire a sholáthar chun an freastalaí SMTP "
+"seo a rochtain."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Ní féidir jab SMTP a chruthú."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Glantéacs"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Gan ainm"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Anaithnid"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"Níl KWallet ar fáil. Moltar go láidir duit úsáid a bhaint as KWallet chun do "
+"chuid focal faire a bhainistiú.\n"
+"Mar sin féin, tig leat an focal faire a stóráil i gcomhad cumraíochta más "
+"mian leat. Stórálfar an focal faire i bhformáid scrofa, ach dá bhfaigheadh "
+"duine éigin rochtain ar an gcomhad, is dócha go mbeadh sé in ann é a "
+"dhíchriptiú.\n"
+"An bhfuil fonn ort an focal faire do fhreastalaí '%1' a stóráil sa chomhad "
+"cumraíochta?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "Níl KWallet ar Fáil"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Sábháil an Focal Faire"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Ná Sábháil an Focal Faire"
+
+#: kmailtransport/transportjob.cpp:131
+#, fuzzy, kde-format
+#| msgid "The mail transport \"%1\" is not correctly configured."
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Níl seoltóir ríomhphoist \"%1\" cumraithe mar is ceart."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Iompar Réamhshocraithe"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Caithfidh tú cuntas amach a chruthú sula seolfaidh tú aon rud."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "An bhfuil fonn ort cuntas a chruthú anois?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Cruthaigh Cuntas Anois"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Cumraigh cuntas"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Freastalaí SMTP ar an Idirlíon"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Stórálann na córais ríomhphoist seo a leanas a bhfocal faire i gcomhad "
+"cumraíochta gan chriptiú.\n"
+"De bharr cúrsaí slándála, smaoinigh ar na focail fhaire seo a bhogadh go "
+"KWallet, an Córas Sparáin KDE,\n"
+"a stórálann sonraí íogaire ar do shon i gcomhad lánchriptithe.\n"
+"An bhfuil fonn ort do chuid focal faire a bhogadh go KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Ceist"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Imirce"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Coinnigh"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Céim a hAon: Roghnaigh Mód Iompair"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Ainm:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Úsáid an cuntas seo mar chuntas amach réamhshocraithe."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Roghnaigh cineál cuntais ón liosta thíos:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Cineál"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Cur Síos"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Ginearálta"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Eolas faoin Chuntas"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, fuzzy, kde-format
+#| msgid "Outgoing mail &server:"
+msgid "Outgoing &mail server:"
+msgstr "Frea&stalaí ríomhphoist amach:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Logáil isteach:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "Foc&al Faire:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "An focal faire le seoladh chuig an bhfreastalaí le haghaidh údaraithe."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Sábháil an focal faire SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Fío&rdheimhniú de dhíth ar an bhfreastalaí"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Casta"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Socruithe an Cheangail"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Braith go hUathoibríoch"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Ní thacaíonn an freastalaí seo le fíordheimhniú"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Criptiú:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "Ga&n Chriptiú"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Fíordheimhniú:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Socruithe SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Seol óstainm saincheaptha go &dtí an freastalaí"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, fuzzy, kde-format
+#| msgid "&Host:"
+msgid "Hostna&me:"
+msgstr "Óst&ríomhaire:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Úsáid seoladh saincheaptha"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Seoladh an tSeoltóra:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Réamhordú:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Bain"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "&Socraigh mar Réamhshocrú"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "C&uir Leis..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Athainmnigh"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Athraigh..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Cruthaigh Cuntas Amach"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Cruthaigh agus Cumraigh"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, fuzzy, kde-format
+#| msgid "This transport cannot be configured."
+msgid "This outgoing account cannot be configured."
+msgstr "Ní féidir an t-iompar seo a chumrú."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Ainm"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Cineál"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Réamhshocrú)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "An bhfuil fonn ort cuntas amach '%1' a bhaint?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "An bhfuil fonn ort an cuntas amach a scriosadh?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Cuir Leis..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, fuzzy, kde-format
+#| msgid "&Modify..."
+msgid "Modify..."
+msgstr "&Athraigh..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Athainmnigh"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Bain"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Socraigh mar Réamhshocrú"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Teachtaireacht fholamh."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Níl aon fhaighteoirí ann."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Iompar neamhbhailí."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Fillteán neamhbhailí do ríomhphost seolta."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Ós&tainm:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "sendmail logánta"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Níorbh fhéidir ríomhchlár seoltóra %1 a rith"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Stad sendmail go mínormálta."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Stad sendmail go mínormálta: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Suiteáil logánta sendmail"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Suíomh sendmai&l:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "Frea&stalaí ríomhphoist:"
+
+#~ msgid "Edit..."
+#~ msgstr "Eagar..."
+
+#~ msgid "text"
+#~ msgstr "téacs"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "Seiceáil &céard a thacaíonn an freastalaí leis"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Modh Fíordheimhnithe"
+
+#~ msgid "&LOGIN"
+#~ msgstr "&LOGÁIL ISTEACH"
+
+#~ msgid "&PLAIN"
+#~ msgstr "&SIMPLÍ"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "&GSSAPI"
+
+#~ msgid "&NTLM"
+#~ msgstr "&NTLM"
+
+#~ msgid "Transport: Sendmail"
+#~ msgstr "Iompar: Sendmail"
+
+#~ msgid "&Location:"
+#~ msgstr "&Suíomh:"
+
+#~ msgid "Choos&e..."
+#~ msgstr "&Roghnaigh..."
+
+#~ msgid "Transport: SMTP"
+#~ msgstr "Iompar: SMTP"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "Use Sendmail"
+#~ msgstr "Úsáid Sendmail"
+
+#~ msgid "Only local files allowed."
+#~ msgstr "Ní cheadaítear ach comhaid logánta."
+
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "Cuir Iompar Leis"
+
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "Athraigh Iompar"
+
+#~ msgid "SM&TP"
+#~ msgstr "SM&TP"
+
+#~ msgid "&Sendmail"
+#~ msgstr "&Sendmail"
+
+#~ msgid "Add Transport"
+#~ msgstr "Cuir Iompar Leis"
+
+#~ msgid "Form"
+#~ msgstr "Foirm"
+
+#~ msgid "Default"
+#~ msgstr "Réamhshocrú"
+
+#~ msgid "%1 (Default)"
+#~ msgstr "%1 (Réamhshocrú)"
diff -Nru kmailtransport-16.12.3/po/gl/kio_smtp.po kmailtransport-17.04.3/po/gl/kio_smtp.po
--- kmailtransport-16.12.3/po/gl/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/gl/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,240 @@
+# translation of kio_smtp.po to galician
+# Copyright (C) 2002, 2003, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
+#
+# Javier Jardón <javierjc@mundo-r.com>, 2002, 2003.
+# Xabi G. Feal <xabigf@gmx.net>, 2006.
+# mvillarino <mvillarino@users.sourceforge.net>, 2007, 2008, 2009.
+# marce villarino <mvillarino@users.sourceforge.net>, 2009.
+# Marce Villarino <mvillarino@gmail.com>, 2009.
+# Xosé <xosecalvo@gmail.com>, 2009, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-02-21 23:23+0100\n"
+"Last-Translator: Xosé <xosecalvo@gmail.com>\n"
+"Language-Team: Galego <proxecto@trasno.net>\n"
+"Language: gl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Environment: kde\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"O servidor rexeitou as ordes EHLO e HELO tratándoas como descoñecidas ou sen "
+"implementar.\n"
+"Por favor, póñase en contacto co administrador do sistema."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Recibiuse unha resposta inesperada do servidor á orde %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"O seu servidor de SMTP non admite TLS. Desactive TLS se quere conectarse sen "
+"cifrado."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"O seu servidor de SMTP di admitir TLS pero a negociación non tivo éxito.\n"
+"Pode desactivar o TLS en KDE usando o diálogo de configuración das contas "
+"SMTP."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Fallou a conexión"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Aconteceu un erro durante a autenticación: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Non se indicaron os detalles da autenticación."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Escolla un método diferente de autenticación."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "O seu servidor de SMTP non admite %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "O seu servidor de SMTP non admite (método non especificado)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"O seu servidor de SMTP non admite autenticación.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Fallou a autenticación.\n"
+"O máis probábel é que o contrasinal fose incorrecto.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Non foi posíbel ler os datos do aplicativo."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"O contido da mensaxe non foi aceptado.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Resposta do servidor:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Resposta do servidor: «%1»"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Isto é un fallo temporal. Pode intentalo máis tarde."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "O aplicativo enviou unha solicitude non válida."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Falta o enderezo do remitente."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "Fallou SMTPProtocol::smtp_open (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"O seu servidor (%1) non admite o envío de mensaxes de 8 bits.\n"
+"Por favor, use a codificación base64 ou «quoted-printable»."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Fallou a escritura no socket."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Recibiuse unha resposta SMTP non válida (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"O servidor (%1) non aceptou a conexión.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Nome de usuario e contrasinal da súa conta SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"O servidor non acepta enderezos de remite en branco.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"O servidor non aceptou o enderezo de remite «%1».\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"O envío de mensaxes fallou porque os seguintes destinatarios foron "
+"rexeitados polo servidor:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Fallou o intento de iniciar o envío do contido da mensaxe.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr ""
+"Descoñécese esta condición de erro. Por favor, envíe un informe de erro."
diff -Nru kmailtransport-16.12.3/po/gl/libmailtransport5.po kmailtransport-17.04.3/po/gl/libmailtransport5.po
--- kmailtransport-16.12.3/po/gl/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/gl/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,765 @@
+# translation of libmailtransport.po to galician
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# mvillarino <mvillarino@users.sourceforge.net>, 2007, 2008, 2009.
+# marce villarino <mvillarino@users.sourceforge.net>, 2009.
+# marce villarino <mvillarino@gmail.com>, 2009.
+# Marce Villarino <mvillarino@gmail.com>, 2009, 2013, 2014.
+# Xosé <xosecalvo@gmail.com>, 2009, 2010.
+# Xosé <xosecalvo@edu.xunta.es>, 2009.
+# Adrian Chaves Fernandez <adriyetichaves@gmail.com>, 2013, 2015, 2016, 2017.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2017-01-14 17:09+0100\n"
+"Last-Translator: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail."
+"com>\n"
+"Language-Team: Galician <kde-i18n-doc@kde.org>\n"
+"Language: gl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Environment: kde\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Identificador único"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Nome do transporte visíbel para o usuario"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "O nome que se usará cando se refira a este servidor."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Sen nome"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "Servidor de SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Recurso do Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Tipo de transporte"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Nome de máquina do servidor"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "O nome de dominio ou o enderezo numérico do servidor de SMTP."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Número de porto do servidor"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"O número de porto que está a escoitar o servidor de SMTP. Por omisión é o 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Nome de usuario preciso para autenticarse"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "O nome de usuario que se enviará ao servidor para autenticalo."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "A orde a executar antes de enviar un correo"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Unha orde que executar localmente antes de enviar o correo. Isto pode usarse "
+"para configurar túneles SSH, por exemplo. Déixeo baleiro se non quere que se "
+"execute ningunha orde."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "O servidor require autenticación"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Marque esta opción se o seu servidor de SMTP require autenticación antes de "
+"aceptar correo. Isto coñécese como «SMTP autenticado» ou, abreviado, ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Gardar o contrasinal"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Marque esta opción para gardar o seu contrasinal. Se o KWallet estiver "
+"dispoñíbel o contrasinal gárdao el, o que se considera seguro. Porén, se o "
+"KWallet non estiver dispoñíbel, o contrasinal gárdase no ficheiro de "
+"configuración. O contrasinal gárdase tras ofuscalo, pero non debe ser "
+"considerado como seguro frente a descifrados de obterse acceso ao ficheiro "
+"de configuración."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Método de cifrado usado na comunicación"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Sen cifrar"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "Cifrado SSL"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "Cifrado TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Método de autenticación"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Marque esta opción para usar un nome de servidor personalizado cando se "
+"identifique ante o servidor de correo. Isto é útil se o nome do seu sistema "
+"non pode ser configurado correctamente ou para agochar o nome auténtico do "
+"seu sistema."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+"Indique o nome de máquina que se usará cando se identifique co servidor."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Marque esta opción para usar un enderezo de remitente personalizado para "
+"identificarse no servidor de correo. Se non se selecciona emprégase o "
+"enderezo da identidade."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Indique o enderezo que desexa empregar para anular o enderezo de remitente "
+"por omisión."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Estase a executar a orde previa"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Estase a executar a orde previa «%1»."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Non foi posíbel executar a orde previa «%1»."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Produciuse un erro ao executar a orde previa «%1»."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "A orde previa pechouse inesperadamente."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "A orde previa saíu co código %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Debe indicar un nome de usuario e un contrasinal para usar este servidor de "
+"SMTP."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Non foi posíbel crear o traballo de SMTP."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Texto simple"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anónimo"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Descoñecido"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"O KWallet non está dispoñíbel. Recoméndase de corazón que use o KWallet para "
+"xestionar os seus contrasinais.\n"
+"Porén, pódeo gardar no ficheiro de configuración. O contrasinal gárdase nun "
+"formato ofuscado, que non debe ser considerado seguro frente a esforzos de "
+"descifralo se un atacante obtén acceso ao ficheiro de configuración.\n"
+"Quere gardar o contrasinal do servidor «%1» no ficheiro de configuración?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "O KWallet non está dispoñíbel"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Gardar o contrasinal"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Non gardar o contrasinal"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "A conta saínte «%1» non está configurada axeitadamente."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Transporte por omisión"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Hai que crear unha conta de saída antes de enviar."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Crear a conta agora?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Crear a conta agora"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Configurar a conta"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Un servidor de SMTP na Internet"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Os transportes de correo seguintes gardan os contrasinais nun ficheiro de "
+"configuración non cifrado.\n"
+"Por motivos de seguranza, pense en empregar o KWallet para gardar os "
+"contrasinais, que garda os datos sensíbeis nun ficheiro cunha cifra forte.\n"
+"Quere migrar os contrasinais para KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Pregunta"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Migrar"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Manter"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Paso un: Seleccione o tipo de transporte"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Nome:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Facer que esta sexa a conta de saída por omisión."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Seleccione un tipo de conta da lista de embaixo:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Tipo"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Descrición"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Xeral"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Información da conta"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Servidor do correo &saínte:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Nome de usuario:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "Contra&sinal:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "O contrasinal que se envia ao servidor para autenticarse."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Gardar o contrasinal de SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "O servidor require autenticación"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Avanzado"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Configuración da conexión"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Detectar automaticamente"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Este servidor non admite autenticación"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Cifrado:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Ningún"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Porto:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Autenticación:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Configuración do SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Enviar un nome de &máquina personalizado ao servidor"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "No&me do servidor: "
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Empregar un enderezo de remitente personalizado"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Enderezo do remitente"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Orde previa:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Eliminar"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "&Converter no predeterminado"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "Enga&dir…"
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "Cambia&r o nome"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Modificar…"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Crear a conta de saída"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Crear e configurar"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Non foi posíbel comprobar as funcionalidades. Verifique o porto e o modo de "
+"autenticación."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Fallou a comprobación das funcionalidades"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Non se pode configurar este transporte saínte."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Nome"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Tipo"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Predeterminado)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Quere eliminar a conta saínte «%1»?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Eliminar a conta saínte?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Engadir…"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Modificar…"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Renomear"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Eliminar"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Facer predeterminado"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "A mensaxe está baleira"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "A mensaxe non ten destinatarios."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "O transporte da mensaxe non é válido."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "O cartafol de saída da mensaxe non é válido."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "&Nome de máquina:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Sendmail local"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Non foi posíbel executar o programa de correo %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail pechouse de xeito anormal."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail pechouse de xeito anormal: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Unha instalación de sendmail local"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "&Localización do sendmail:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "Servidor do correo &saínte:"
+
+#~ msgid "Edit..."
+#~ msgstr "Editar…"
diff -Nru kmailtransport-16.12.3/po/he/kio_smtp.po kmailtransport-17.04.3/po/he/kio_smtp.po
--- kmailtransport-16.12.3/po/he/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/he/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,237 @@
+# translation of kio_smtp.po to hebrew
+# KDE Hebrew Localization Project
+# Translation of kio_smtp.po into Hebrew
+#
+# In addition to the copyright owners of the program
+# which this translation accompanies, this translation is
+# Copyright (C) 2002 Meni Livne <livne@kde.org>
+#
+# This translation is subject to the same Open Source
+# license as the program which it accompanies.
+# Diego Iastrubni <elcuco@kde.org>, 2005.
+# tahmar1900 <tahmar1900@gmail.com>, 2006.
+# Elkana Bardugo <ttv200@gmail.com>, 2017. #zanata
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2017-05-16 07:05-0400\n"
+"Last-Translator: Copied by Zanata <copied-by-zanata@zanata.org>\n"
+"Language-Team: hebrew <kde-l10n-he@kde.org>\n"
+"Language: he\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Zanata 3.9.6\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"תגובת שרת לא צפויה לפקודה %1. \n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"שרת ה־SMTP שלך לא תומך ב־TLS. אם ברצונך להתחבר ללא הצפנה, בטל את התמיכה ב־"
+"TLS."
+
+#: command.cpp:197
+#, fuzzy, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"שרת ה־SMTP שלך טוען שהוא תומך ב־TLS, אך ההתקשרות לא הצליחה.\n"
+"באפשרותך לבטל את התמיכה של KDE ב־TLS באמצעות מודול הגדרות ההצפנה."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "ההתחברות נכשלה"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr ""
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "לא נמצאו שיטות אימות תואמות."
+
+#: command.cpp:384
+#, fuzzy, kde-format
+msgid "Choose a different authentication method."
+msgstr ""
+"שרת ה־SMTP שלך לא תומך ב־%1.\n"
+"בחר שיטת אימות אחרת.\n"
+"%2"
+
+#: command.cpp:386
+#, fuzzy, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "שרת ה־SMTP שלך לא תומך באימות. %2"
+
+#: command.cpp:387
+#, fuzzy, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "שרת ה־SMTP שלך לא תומך באימות. %2"
+
+#: command.cpp:391
+#, fuzzy, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr "שרת ה־SMTP שלך לא תומך באימות. %2"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"האימות נכשל.\n"
+"סביר להניח שהססמה שגויה.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "אין אפשרות לקרוא מידע מהתוכנה."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"תוכן ההודעה לא התקבל.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"השרת השיב:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "השרת השיב: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "זוהי תקלה זמנית. יש לנסות שנית מאוחר יותר."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "התוכנה שלחה בקשה שגויה."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "כתובת השולח חסרה."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "כישלון ב־SMTPProtocol::smtp_open  (%1)"
+
+#: smtp.cpp:223
+#, fuzzy, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"השרת שלך לא תומך בשליחת מסרים בשמונה סיביות. \n"
+"אנא השתמש בבסיס64 או בקידוד מודפס-מצוטט."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr ""
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "התקבלה תגובה שגויה של SMTP (%1)."
+
+#: smtp.cpp:537
+#, fuzzy, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"השרת לא קיבל את החיבור. \n"
+"%1"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "שם המשתמש והססמה לחשבון ה־SMTP שלך:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"שרת זה אינו מאפשר כתובת שולח ריקה. \n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"השרת לא קיבל את כתובת השולח \"%1\".\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"הניסיון להתחיל לשלוח את תוכן ההודעה נכשל.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr ""
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "תמיכה בהזדהות לא הודרה אל תוך kip_smtp"
diff -Nru kmailtransport-16.12.3/po/hi/kio_smtp.po kmailtransport-17.04.3/po/hi/kio_smtp.po
--- kmailtransport-16.12.3/po/hi/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/hi/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,259 @@
+# translation of kio_smtp.po to Hindi
+# Ravishankar Shrivastava <raviratlami@yahoo.com>, 2004.
+# Ravishankar Shrivastava <raviratlami@gmail.com>, 2004.
+# G Karunakar <karunakar@indlinux.org>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2007-08-18 15:14+0530\n"
+"Last-Translator: G Karunakar <karunakar@indlinux.org>\n"
+"Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
+"Language: hi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"सर्वर ने दोनों ही EHLO तथा HELO कमांड्स को अज्ञात या लागू नहीं मान कर अस्वीकृत कर "
+"दिया.\n"
+"कृपया सर्वर के तंत्र प्रशासक से संपर्क करें."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"कमांड %1 पर अप्रत्याशित सर्वर रेस्पांस:\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"आपका एसएमटीपी सर्वर टीएलएस समर्थन नहीं करता है. टीएलएस अक्षम करें यदि आप बिना "
+"एनक्रिप्शन के कनेक्ट होना चाहते हैं."
+
+#: command.cpp:197
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your SMTP server claims to support TLS, but negotiation was "
+#| "unsuccessful.\n"
+#| "You can disable TLS in KDE using the crypto settings module."
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"आपका एसएमटीपी सर्वर टीएलएस के समर्थन का दावा करता है परंतु बातचीत असफल रही. \n"
+"आप केडीई में टीएलएस को क्रिप्टो विन्यास मॉड्यूल के उपयोग से अक्षम कर सकते हैं."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "कनेक्शन असफल"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "प्रमाणीकरण के दौरान एक त्रुटि हुई:%1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "कोई प्रमाणीकरण विवरण नहीं मिले"
+
+#: command.cpp:384
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your SMTP server does not support %1.\n"
+#| "Choose a different authentication method.\n"
+#| "%2"
+msgid "Choose a different authentication method."
+msgstr ""
+"आपका एसएमटीपी सर्वर %1 को समर्थित नहीं करता है .\n"
+"भिन्न प्रमाणीकरण विधि चुनें.\n"
+"%2"
+
+#: command.cpp:386
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your SMTP server does not support authentication.\n"
+#| "  %1"
+msgid "Your SMTP server does not support %1."
+msgstr ""
+"आपका एसएमटीपी सर्वर प्रमाणीकरण समर्थित नहीं करता है.\n"
+"%1"
+
+#: command.cpp:387
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your SMTP server does not support authentication.\n"
+#| "  %1"
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr ""
+"आपका एसएमटीपी सर्वर प्रमाणीकरण समर्थित नहीं करता है.\n"
+"%1"
+
+#: command.cpp:391
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your SMTP server does not support authentication.\n"
+#| "  %1"
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"आपका एसएमटीपी सर्वर प्रमाणीकरण समर्थित नहीं करता है.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"लॉगइन में असफल. \n"
+"संभवतः पासवर्ड गलत है.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "अनुप्रयोग से डाटा नहीं पढ़ा जा सका"
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"संदेश विषय-वस्तु स्वीकार्य नहीं हुआ.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"सर्वर ने जवाब दिया:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "सर्वर ने जवाब दिया: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "वहाँ एक अस्थायी असफलता हुई. आप बाद में फिर से  कोशिश कर सकते हैं."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "अनुप्रयोग ने अवैध निवेदन प्रेषित किया."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "भेजने वाले का पता गुम है."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "एसएमटीपी-प्रोटोकॉल::smtp_open असफल (%1)"
+
+#: smtp.cpp:223
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your server does not support sending of 8-bit messages.\n"
+#| "Please use base64 or quoted-printable encoding."
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"आपका सर्वर 8-बिट संदेश प्रेषित करना समर्थित नहीं करता है.\n"
+"कृपया बेस64 या कोटेड-प्रिंटेबल एनकोडिंग इस्तेमाल करें."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "सोकेट पे लिखने में असफल."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "अवैध एसएमटीपी जवाब (%1) मिला."
+
+#: smtp.cpp:537
+#, fuzzy, kde-format
+#| msgid ""
+#| "The server did not accept the connection.\n"
+#| "%1"
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"सर्वर ने कनेक्शन स्वीकार नहीं किया.\n"
+"%1"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "आपके एसएमटीपी ख़ाता का उपयोक्ता नाम तथा पासवर्ड:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"सर्वर भेजने वाले के रिक्त पता को स्वीकार नहीं करता है.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"सर्वर द्वारा भेजने वाले का पता \"%1\" को स्वीकार नहीं कर रहा.\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"संदेश भेजा जाना असफल चूंकि निम्न प्राप्तकर्ता सर्वर द्वारा अस्वीकृत कर दिए गए:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"संदेश विषय-वस्तु को प्रेषित करने की कोशिश असफल.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "अनहैंडल्ड त्रुटि परिस्थिति. कृपया बग रपट भेजें."
diff -Nru kmailtransport-16.12.3/po/hi/libmailtransport5.po kmailtransport-17.04.3/po/hi/libmailtransport5.po
--- kmailtransport-16.12.3/po/hi/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/hi/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,817 @@
+# translation of libmailtransport.po to Hindi
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Ravishankar Shrivastava <raviratlami@yahoo.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2008-01-28 13:21+0530\n"
+"Last-Translator: Ravishankar Shrivastava <aviratlami@aol.in>\n"
+"Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
+"Language: hi\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "बेजोड़ पहचान"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, fuzzy, kde-format
+#| msgid "User visible transport name"
+msgid "User-visible transport name"
+msgstr "उपयोक्ता को दिखाई देने वाला ट्रांसपोर्ट नाम"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "इस सर्वर का उल्लेख करते समय जो नाम उपयोग में लिया जाएगा."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, fuzzy, kde-format
+#| msgid "&Name:"
+msgid "Unnamed"
+msgstr "नाम: (&N)"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "एसएमटीपी सर्वर"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr ""
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "ट्रांसपोर्ट क़िस्म"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "सर्वर का होस्टनाम"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "डोमेन नाम या एसएमटीपी सर्वर का संख्यात्मक पता."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "सर्वर का पोर्ट क्रमांक"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "पोर्ट क्रमांक जिस पर एसएमटीपी सर्वर सुनता है. डिफ़ॉल्ट पोर्ट है 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "लॉगिन के लिए आवश्यक उपयोक्ता का नाम"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "अनुमोदन के लिए सर्वर को भेजा जाने वाला उपयोक्ता नाम."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "ईमेल भेजने से पहले चलाया जाने वाला कमांड"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "सर्वर को प्रमाणीकरण की आवश्यकता है"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "पासवर्ड भंडारित करें"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "संचार के लिए प्रयोग में लिए जा रहे एनक्रिप्शन की विधि"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "कोई एनक्रिप्शन नहीं"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "एसएसएल एनक्रिप्शन"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "टीएलएस एनक्रिप्शन"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "प्रमाणीकरण विधि"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- कार्य-सूची -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "होस्टनाम प्रविष्ट करें जिसका प्रयोग तब किया जाएगा जब सर्वर की पहचान की जाएगी."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, fuzzy, kde-format
+#| msgid ""
+#| "Enter the hostname that should be used when identifying to the server."
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr "होस्टनाम प्रविष्ट करें जिसका प्रयोग तब किया जाएगा जब सर्वर की पहचान की जाएगी."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "प्री-कमांड चलाया जा रहा है"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "प्री-कमांड '%1' चलाया जा रहा है."
+
+#: kmailtransport/precommandjob.cpp:89
+#, fuzzy, kde-format
+#| msgid "Could not execute precommand '%1'."
+msgid "Unable to start precommand '%1'."
+msgstr "प्री-कमांड '%1' चला नहीं सका."
+
+#: kmailtransport/precommandjob.cpp:91
+#, fuzzy, kde-format
+#| msgid "Executing precommand '%1'."
+msgid "Error while executing precommand '%1'."
+msgstr "प्री-कमांड '%1' चलाया जा रहा है."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "प्रीकमांड क्रैश हो गया."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "कोड %1 के साथ प्रीकमांड बाहर हुआ."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"इस एसएमटीपी सर्वर का उपयोग करने के लिए आपको एक उपयोक्ता नाम तथा पासवर्ड देना होगा."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "एसएमटीपी कार्य बनाने में अक्षम."
+
+#: kmailtransport/transport.cpp:92
+#, fuzzy, kde-format
+#| msgid "%1 %2"
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 %2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr ""
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr ""
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr ""
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "केवालेट उपलब्ध नहीं"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "पासवर्ड भंडारित करें"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "पासवर्ड भंडारित न करें"
+
+#: kmailtransport/transportjob.cpp:131
+#, fuzzy, kde-format
+#| msgid "The mail transport \"%1\" is not correcty configured."
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "ईमेल ट्रांसपोर्ट \"%1\" ठीक तरीके से कॉन्फ़िगर किया हुआ नहीं है."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "डिफ़ॉल्ट ट्रांसपोर्ट"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:472
+#, fuzzy, kde-format
+#| msgid "SMTP"
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "एसएमटीपी"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "प्रश्न"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "माइग्रेट करें"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "रखें"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, fuzzy, kde-format
+#| msgid "Transport Type"
+msgid "Step One: Select Transport Type"
+msgstr "ट्रांसपोर्ट क़िस्म"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, fuzzy, kde-format
+#| msgid "&Name:"
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "नाम: (&N)"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, fuzzy, kde-format
+#| msgid "Type"
+msgid "Type"
+msgstr "क़िस्म"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, fuzzy, kde-format
+#| msgid "No encryption"
+msgid "Description"
+msgstr "कोई एनक्रिप्शन नहीं"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, fuzzy, kde-format
+#| msgid "&General"
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "सामान्य (&G)"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "लॉगइनः (&L)"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "पासवर्डः (&a)"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "अनुमोदन के लिए सर्वर को भेजा जाने वाला पासवर्ड."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "एसएमटीपी पासवर्ड भंडारित करें (&S)"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "सर्वर को प्रमाणीकरण की आवश्यकता है (&r)"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, fuzzy, kde-format
+#| msgid "&Advanced"
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "विस्तृत (&A)"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "सर्वर प्रमाणीकरण समर्थित नहीं करता है"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, fuzzy, kde-format
+#| msgid "Encryption"
+msgid "Encryption:"
+msgstr "एनक्रिप्शन"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "कुछ नहीं (&N)"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "एसएसएल (&S)"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "टीएलएस (&T)"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "पोर्टः (&P)"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, fuzzy, kde-format
+#| msgid "Authentication method"
+msgid "Authentication:"
+msgstr "प्रमाणीकरण विधि"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "सर्वर को मनपसंद होस्टनाम भेजें (&d)"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, fuzzy, kde-format
+#| msgid "&Host:"
+msgid "Hostna&me:"
+msgstr "होस्टः (&H)"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "प्री-कमांड:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, fuzzy, kde-format
+#| msgid "R&emove"
+msgid "Remo&ve"
+msgstr "मिटाएँ (&e)"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, fuzzy, kde-format
+#| msgid "Set Default"
+msgid "&Set as Default"
+msgstr "डिफ़ॉल्ट नियत करें"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "जोड़ें... (&d)"
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, fuzzy, kde-format
+#| msgid "&Name:"
+msgid "&Rename"
+msgstr "नाम: (&N)"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "सुधारें... (&M)"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr ""
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, fuzzy, kde-format
+#| msgid "The mail transport \"%1\" is not correcty configured."
+msgid "This outgoing account cannot be configured."
+msgstr "ईमेल ट्रांसपोर्ट \"%1\" ठीक तरीके से कॉन्फ़िगर किया हुआ नहीं है."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, fuzzy, kde-format
+#| msgid "Name"
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "नाम"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, fuzzy, kde-format
+#| msgid "Type"
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "क़िस्म"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, fuzzy, kde-format
+#| msgid " (Default)"
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr "(डिफ़ॉल्ट)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, fuzzy, kde-format
+#| msgid "A&dd..."
+msgid "Add..."
+msgstr "जोड़ें... (&d)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, fuzzy, kde-format
+#| msgid "&Modify..."
+msgid "Modify..."
+msgstr "सुधारें... (&M)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, fuzzy, kde-format
+#| msgid "&Name:"
+msgid "Rename"
+msgstr "नाम: (&N)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, fuzzy, kde-format
+#| msgid "R&emove"
+msgid "Remove"
+msgstr "मिटाएँ (&e)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, fuzzy, kde-format
+#| msgid "Set Default"
+msgid "Set as Default"
+msgstr "डिफ़ॉल्ट नियत करें"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr ""
+
+#~ msgid "Hos&tname:"
+#~ msgstr "होस्ट-नामः (&t)"
+
+#~ msgid "Local sendmail"
+#~ msgstr "स्थानीय सेंडमेल"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "मेलर प्रोग्राम %1 को चलाने में असफल"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "सेंडमेल असाधारण रूप से बाहर हुआ."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "सेंडमेल असाधारण रूप से बाहर हुआ: %1"
+
+#, fuzzy
+#~| msgid "Sendmail"
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "सेंडमेल"
+
+#, fuzzy
+#~| msgid "Local sendmail"
+#~ msgid "A local sendmail installation"
+#~ msgstr "स्थानीय सेंडमेल"
+
+#, fuzzy
+#~| msgid "Choose sendmail Location"
+#~ msgid "Sendmail &Location:"
+#~ msgstr "सेंडमेल स्थान चुनें"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "जाँचें कि सर्वर क्या समर्थित करता है (&W)"
+
+#~ msgid "Authentication Method"
+#~ msgstr "प्रमाणीकरण विधि"
+
+#~ msgid "&LOGIN"
+#~ msgstr "लॉगइन (&L)"
+
+#~ msgid "&PLAIN"
+#~ msgstr "सादा (&P)"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "जीएसएसएपीआई (&G)"
+
+#~ msgid "&NTLM"
+#~ msgstr "एनटीएलएम (&N)"
+
+#~ msgid "Transport: Sendmail"
+#~ msgstr "हस्तांतरणः सेंडमेल"
+
+#~ msgid "&Location:"
+#~ msgstr "स्थानः (&L)"
+
+#~ msgid "Choos&e..."
+#~ msgstr "चुनें... (&e)"
+
+#~ msgid "Transport: SMTP"
+#~ msgstr "परिवहनः एसएमटीपी"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#, fuzzy
+#~| msgid "Sendmail"
+#~ msgid "Use Sendmail"
+#~ msgstr "सेंडमेल"
+
+#~ msgid "Only local files allowed."
+#~ msgstr "सिर्फ स्थानीय फ़ाइलें ही स्वीकार्य."
+
+#, fuzzy
+#~| msgid "Add Transport"
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "हस्तांतरण जोड़ें"
+
+#, fuzzy
+#~| msgid "Modify Transport"
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "हस्तांतरण परिवर्धित करें"
+
+#~ msgid "SM&TP"
+#~ msgstr "एसएमटीपी (&T)"
+
+#~ msgid "&Sendmail"
+#~ msgstr "सेंडमेल (&S)"
+
+#~ msgid "Add Transport"
+#~ msgstr "हस्तांतरण जोड़ें"
diff -Nru kmailtransport-16.12.3/po/hr/kio_smtp.po kmailtransport-17.04.3/po/hr/kio_smtp.po
--- kmailtransport-16.12.3/po/hr/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/hr/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,276 @@
+# Translation of kio_smtp to Croatian
+#
+# Translators: Denis Lackovic <delacko@fly.srk.fer.hr>,Diana Ćorluka <dina@iskrameco.hr>,Mato Kutlić <mate@iskraemeco.hr>,sime essert <sime2@nofrx.org>,Vlatko Kosturjak <kost@linux.hr>,
+# Marko Dimjašević <marko@dimjasevic.net>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp 0\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2011-06-28 15:27+0200\n"
+"Last-Translator: Marko Dimjašević <marko@dimjasevic.net>\n"
+"Language-Team: Croatian <kde-croatia-list@lists.sourceforge.net>\n"
+"Language: hr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 1.2\n"
+"X-Environment: kde\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Poslužitelj je odbacio i naredbu EHLO i HELO kao nepoznate ili "
+"neimplementirane.\n"
+"Kontaktirajte administratora poslužitelja."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Neočekivani odgovor poslužitelja na naredbu %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Vaš SMTP poslužitelj ne podržava TLS. Isključite TLS ukoliko želite da se "
+"povežete bez kriptiranja."
+
+#: command.cpp:197
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your SMTP server claims to support TLS, but negotiation was "
+#| "unsuccessful.\n"
+#| "You can disable TLS in KDE using the crypto settings module."
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Vaš SMTP poslužitelj tvrdi da podržava TLS, ali komunikacija nije bila "
+"uspješna.\n"
+"TLS možete isključiti u KDE-u korištenjem modula za podešavanje kriptiranja."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Veza neuspješna"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr ""
+
+#: command.cpp:274
+#, fuzzy, kde-format
+msgid "No authentication details supplied."
+msgstr "Nije pronađen kompatibilna metoda za prijavljivanje."
+
+#: command.cpp:384
+#, fuzzy, kde-format
+msgid "Choose a different authentication method."
+msgstr ""
+"Vaš SMTP poslužitelj ne podržava %1.\n"
+"Odaberite drugi način autentifikacije."
+
+#: command.cpp:386
+#, fuzzy, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr ""
+"Vaš SMTP poslužitelj ne podržava autentifikaciju.\n"
+"%2"
+
+#: command.cpp:387
+#, fuzzy, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr ""
+"Vaš SMTP poslužitelj ne podržava autentifikaciju.\n"
+"%2"
+
+#: command.cpp:391
+#, fuzzy, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Vaš SMTP poslužitelj ne podržava autentifikaciju.\n"
+"%2"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Autentifikacija nije uspjela. \n"
+"Vjerojatno se radi o pogrešnoj lozinci.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Ne mogu pročitati podatke iz aplikacije."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Sadržaj poruke nije prihvaćen.\n"
+"%1 "
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Poslužitelj je odgovorio:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Poslužitelj je odgovorio: „%1“"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Ovo je privremeni neuspjeh. Možete probati ponovo kasnije."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Program je poslao neispravan zahtjev."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Nedostaje adresa pošiljaoca."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open nije uspio (%1)"
+
+#: smtp.cpp:223
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your server does not support sending of 8-bit messages.\n"
+#| "Please use base64 or quoted-printable encoding."
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Vaš poslužitelj ne podržava slanje 8-bitnih poruka.\n"
+"Koristite kodiranje base64 ili „quoted-printeble“."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr ""
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Neispravan SMTP odgovor (%1) zaprimljen."
+
+#: smtp.cpp:537
+#, fuzzy, kde-format
+#| msgid ""
+#| "The server did not accept the connection.\n"
+#| "%1"
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Poslužitelj nije zaprimio vezu.\n"
+"%1"
+
+#: smtp.cpp:602
+#, fuzzy, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Kornsik i zaporka za vaš SMTP račun:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Poslužitelj nije prihvatio praznu adresu pošiljaoca.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Poslužitelj nije prihvatio adresu pošiljaoca „%1“.\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Slanje poruka nije uspjelo jer su sljedeći primaoci odbačeni od strane "
+"poslužitelja:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Pokušaj slanja sadržaja poruke nije uspio.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr ""
+"Dogodila se greška koju nije moguće obraditi. Molim pošaljite izvješće o "
+"greški."
+
+#, fuzzy
+#~ msgid ""
+#~ "Your SMTP server does not support %1.\n"
+#~ "Choose a different authentication method.\n"
+#~ "%2"
+#~ msgstr ""
+#~ "Vaš SMTP poslužitelj ne podržava %1.\n"
+#~ "Odaberite drugi način autentifikacije.\n"
+#~ "%2"
+
+#, fuzzy
+#~ msgid ""
+#~ "You have requested to authenticate to the server, but the server does not "
+#~ "seem to support authentication.\n"
+#~ "Try disabling authentication entirely."
+#~ msgstr ""
+#~ "Tražili ste da se autentificirate na poslužitelj, ali izgleda da "
+#~ "poslužitelj ne podržava autentifikaciju.\n"
+#~ "Probajte isključiti autentifikaciju u potpunosti."
+
+#~ msgid "When prompted, you ran away."
+#~ msgstr "Kada vam je bio postavljen upit, vi ste otišli."
diff -Nru kmailtransport-16.12.3/po/hu/kio_smtp.po kmailtransport-17.04.3/po/hu/kio_smtp.po
--- kmailtransport-16.12.3/po/hu/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/hu/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,237 @@
+#
+# Tamas Szanto <tszanto@interware.hu>, 2002.
+# Kristóf Kiszel <ulysses@kubuntu.org>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: KDE 4.1\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-12-26 15:54+0100\n"
+"Last-Translator: Kristóf Kiszel <ulysses@kubuntu.org>\n"
+"Language-Team: Hungarian <kde-lista@sophia.jpte.hu>\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"A kiszolgáló elutasította az EHLO és HELO parancsokat, mintha nem ismert "
+"vagy nem implementált parancsok lennének.\n"
+"Próbáljon segítséget kérni a rendszergazdától."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Nem várt választ küldött a kiszolgáló, az elküldött parancs: %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Az SMTP-kiszolgáló nem támogatja a TLS-t. Tiltsa le a TLS használatát a "
+"titkosítás nélküli használathoz."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Az SMTP-kiszolgáló azt jelezte, hogy támogatja a TLS-t, de a "
+"paraméteregyeztetés nem sikerült.\n"
+"A TLS használata letiltható az SMTP fiókbeállítások párbeszédablakban."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "A kapcsolat megszakadt"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Hiba történt a felhasználóazonosítás során: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Nincsenek megadva a felhasználóazonosításhoz szükséges adatok."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Válasszon más felhasználóazonosítási módszert."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr ""
+"Az SMTP-kiszolgáló nem támogatja ezt a felhasználóazonosítási módot: %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr ""
+"Az SMTP-kiszolgáló nem támogatja ezt a felhasználóazonosítási módot: (nincs "
+"megadva)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Az SMTP-kiszolgáló nem támogat semmilyen felhasználóazonosítási módot.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"A jelszóazonosítás nem sikerült.\n"
+"Valószínűleg hibás jelszót adott meg.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Nem sikerült adatokat beolvasni az alkalmazásból."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Az üzenet tartalmát a kiszolgáló nem fogadta el.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"A kiszolgáló válasza:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "A kiszolgáló válasza: „%1”"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Ez egy átmeneti hiba, később próbálkozzon újra."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Az alkalmazás érvénytelen kérést küldött."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "A feladó címe hiányzik."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "Az SMTPProtocol::smtp_open függvényhívás nem sikerült (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"A kiszolgáló (%1) nem támogatja 8-bites üzenetek küldését.\n"
+"Használjon „base64” vagy „quoted-printable” kódolást."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Hiba történt az aljazat írása közben."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Érvénytelen SMTP válasz érkezett (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"A kiszolgáló (%1) visszautasította a csatlakozási kérést.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Az SMTP-kiszolgáló használatához szükséges felhasználónév és jelszó:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"A kiszolgáló nem fogadta el az üres feladói címet.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"A kiszolgáló nem fogadta el a(z) „%1” feladói címet.\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Az üzenetküldés nem sikerült, mert a kiszolgáló visszautasította a következő "
+"címzetteket:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Nem sikerült elkezdeni az adattartalom továbbítását.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Nem kezelhető hiba történt. Kérjük küldjön róla hibajelentést."
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr ""
+#~ "A kio_smtp komponensbe nincs belefordítva a felhasználóazonosítási "
+#~ "támogatás."
diff -Nru kmailtransport-16.12.3/po/hu/libmailtransport5.po kmailtransport-17.04.3/po/hu/libmailtransport5.po
--- kmailtransport-16.12.3/po/hu/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/hu/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,808 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Tamas Szanto <tszanto@interware.hu>, 2007.
+# Kristóf Kiszel <ulysses@kubuntu.org>, 2011, 2012, 2014.
+# Balázs Úr <urbalazs@gmail.com>, 2012, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: KDE 4.3\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2014-09-04 15:25+0200\n"
+"Last-Translator: Kristóf Kiszel <ulysses@kubuntu.org>\n"
+"Language-Team: Hungarian <kde-l10n-hu@kde.org>\n"
+"Language: hu\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 1.5\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Egyedi azonosító"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Megjelenített továbbítónév"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "A kiszolgáló hivatkozási neve."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Névtelen"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP-kiszolgáló"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi-erőforrás"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Továbbító típus"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "A kiszolgáló gépneve"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Az SMTP-kiszolgáló tartományneve vagy numerikus címe."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Port"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"Ezen a TCP-porton kommunikál az SMTP-kiszolgáló. Alapértelmezett értéke 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Felhasználónév"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "A felhasználóazonosításhoz szükséges név."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Üzenet elküldése előtt végrehajtandó parancs"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"E-mail elküldése előtt lefuttatandó helyi parancs. Használatával "
+"beállíthatja például a használandó SSL-csatornát. Hagyja üresen, ha nem kell "
+"parancsot futtatni."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "A kiszolgáló eléréséhez felhasználóazonosítás szükséges."
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Jelölje be, ha az SMTP-kiszolgáló eléréséhez név és jelszó megadása "
+"szükséges. Ezt „Hitelesített SMTP”-nek vagy ASMTP-nek is nevezik."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "A jelszó mentése"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Jelölje be, ha el szeretné menteni a jelszót.\n"
+"Ha a KWallet aktiválva van, akkor az fogja elmenteni a jelszót. Ez a "
+"választható legbiztonságosabb tárolási mód.\n"
+"Ha a KWallet nem érhető el, a jelszó a beállítófájlba lesz elmentve. A "
+"jelszó némileg elmaszkírozott formában lesz elmentve, de ebből könnyen "
+"visszanyerhető az eredeti jelszó, ezért nem tekinthető biztonságos "
+"megoldásnak."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Titkosítási mód"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Nincs titkosítás"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Felhasználóazonosítási mód"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Jelölje be ezt, ha egy megadott gépnéven szeretne kommunikálni a levelezési "
+"kiszolgálóval. Akkor lehet hasznos, ha a gépnév nem megfelelő vagy esetleg "
+"el szeretné rejteni, melyik gépről küldi el az üzenetet."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Adja meg a kiszolgáló gépnevét."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Jelölje be ezt, ha egyéni küldő címet szeretne használni a "
+"levelezőkiszolgálóra történő azonosításkor. Ha nincs bejelölve, az "
+"identitásból származó cím lesz használva."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Adja meg azt a címet, amelyet az alapértelmezett küldő címének felülírására "
+"használhat."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Előparancs végrehajtása"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Előparancs végrehajtása: '%1'"
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Nem sikerült elindítani ezt az előparancsot: „%1”"
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Hiba az előparancs végrehajtása közben: „%1”"
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Az előparancs lefagyott."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Az előparancs befejeződött, kilépési kód: %1"
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr "Az SMTP-kiszolgáló eléréséhez név és jelszó megadása szükséges."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Nem sikerült létrehozni egy SMTP-feladatot."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Sima szöveg"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Névtelen"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Ismeretlen"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"A KWallet nem érhető el. A KWallet a legbiztonságosabb, ezért ajánlott "
+"jelszómentési lehetőség.\n"
+"A jelszó elmenthető a beállítófájlba is. Ilyenkor a jelszó nehezen "
+"felismerhető, maszkírozott formában lesz elmentve, de ebből a jelszó könnyen "
+"visszafejthető, ezért nem tekinthető biztonságos eljárásnak.\n"
+"El szeretné menteni a(z) '%1' kiszolgáló eléréséhez használt jelszót a "
+"beállítófájlba?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "A KWallet nem érhető el"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "A jelszó elmentése"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "A jelszót nem kell elmenteni"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "A(z) „%1” kimenő fiók nincs helyesen beállítva."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Alapértelmezett továbbító"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Létre kell hoznia egy kimenő fiókot a küldés előtt."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Új fiók létrehozása?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Fiók létrehozása most"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Fiók beállítása"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Egy SMTP kiszolgáló az interneten"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Az alábbi továbbítók nem titkosított beállítófájlban tárolják az eléréshez "
+"szükséges jelszót.\n"
+"A KWallet jelszótároló a választható legbiztonságosabb, erős titkosítást "
+"alkalmazó jelszótárolási mód, ezért érdemes áttérni a használatára.\n"
+"Át szeretné helyezni a jelszavakat a KWalletbe?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Kérdés"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Migrálás"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Megtartás"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Első lépés: Válasszon továbbítótípust"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Név:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Legyen ez az alapértelmezett kimenő fiók."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Válasszon ki egy fióktípust az alábbi listából:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Típus"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Leírás"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Általános"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Fiókinformációk"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, fuzzy, kde-format
+#| msgid "Outgoing mail &server:"
+msgid "Outgoing &mail server:"
+msgstr "Levél&kiküldési kiszolgáló:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Név:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "&Jelszó:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "A névhez tartozó jelszó."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "A jelszó &elmentése"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "A &kiszolgáló eléréshez meg kell adni egy érvényes nevet és jelszót."
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Speciális"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Kapcsolódási beállítások"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Automatikus felismerés"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "A kiszolgáló nem támogat felhasználóazonosítást"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Titkosítás:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Egyik sem"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Hitelesítés:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP beállítások"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Egyedi &gépnév jelzése a kiszolgálónak"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Egyéni küldő cím használata"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Küldő címe:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Előparancs:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Eltávolítás"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Beállítá&s alapértelmezésnek"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "&Hozzáadás..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "Átneve&zés"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "Mó&dosítás..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Kimenő azonosító létrehozása"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Létrehozás és beállítás"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Nem sikerült ellenőrizni a képességeket. Nézze át a port és hitelesítési mód "
+"beállításait."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Nem sikerült ellenőrizni a képességeket"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Ez a kimenő fiók nem állítható be."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Név"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Típus"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Alapértelmezés)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Szeretné eltávolítani a(z) „%1” kimenő fiókot?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Kimenő fiók eltávolítása?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Hozzáadás…"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Módosítás…"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Átnevezés"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Eltávolítás"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Beállítás alapértelmezettként"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Üres üzenet."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Az üzenetnek nincsenek címzettjei."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Az üzenetnek érvénytelen továbbítása van."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Az üzenetnek érvénytelen elküldött levelek mappája van."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Gé&pnév:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Helyi sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Nem sikerült végrehajtani a(z) %1 üzenetküldő programot"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "A Sendmail hibajelzéssel fejeződött be."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "A Sendmail hibajelzéssel lépett ki: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Egy helyi sendmail telepítés"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "A sendmail &elérési útja:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "Levél&kiszolgáló:"
+
+#~ msgid "Edit..."
+#~ msgstr "Szerkesztés…"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "A kiszolgálón támogatott &funkciók"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Felhasználóazonosítási mód"
+
+#~ msgid "&LOGIN"
+#~ msgstr "&LOGIN"
+
+#~ msgid "&PLAIN"
+#~ msgstr "&PLAIN"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "&GSSAPI"
+
+#~ msgid "&NTLM"
+#~ msgstr "&NTLM"
+
+#~ msgid "Transport: Sendmail"
+#~ msgstr "Továbbító: Sendmail"
+
+#~ msgid "&Location:"
+#~ msgstr "&Hely:"
+
+#~ msgid "Choos&e..."
+#~ msgstr "Vá&lasszon..."
+
+#~ msgid "Transport: SMTP"
+#~ msgstr "Továbbító: SMTP"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "Use Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "Only local files allowed."
+#~ msgstr "Csak helyi fájlokat lehet használni."
+
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "Továbbító hozzáadása"
+
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "Továbbító módosítása"
diff -Nru kmailtransport-16.12.3/po/ia/kio_smtp.po kmailtransport-17.04.3/po/ia/kio_smtp.po
--- kmailtransport-16.12.3/po/ia/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ia/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,233 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# g.sora <g.sora@tiscali.it>, 2011, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2012-05-17 14:30+0200\n"
+"Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
+"Language-Team: Interlingua <kde-i18n-it@kde.org>\n"
+"Language: ia\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Le servitor refusava sia commandos EHLO que HELO como incognite o non "
+"actuate.\n"
+"Pro favor tu continge le administrator de systema del servitor."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Responsa de servitor impreviste al commando %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Tu servitor SMTP non supporta TLS. Dishabilita TLS, si tu vole connecter sin "
+"cryptation."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Tu servitor SMTP declara supportar TLS, ma negotiation esseva sin successo.\n"
+"Tu pote dishabilitar TLS in le dialogo de preferentias de conto SMTP."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Connexion fallite"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Un error occurreva durante le authentication: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Nulle detalios de authentication fornite."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Selige un methodo differente  de authentication."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Tu servitor SMTP non supporta %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Tu servitor SMTP  non supporta (methodo non specificate)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Tu servitor SMTP  non supporta authentication.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Il falleva authentication.\n"
+"Plus probabilemente le contrasigno es errate.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Il non pote leger datos ex application."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Le contento de message non recipeva acceptation.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Le servitor respondeva:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Le servitor respondeva: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Isto es un fallimento temporari. Tu pote tentar de nove plus tarde."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Le application inviava un requesta invalide."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Le adresse de mittente es mancante."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "Protocollo SMTP: smtp_open falleva (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Tu servitor (%1) non supporta invio de messages de 8-bit.\n"
+"Per favor tu usa codifica base64 o citation-imprimibile (quote printable "
+"encoding)."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Il falleva scriber in socket."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Il recipeva invalide responsa (%1) de SMTP."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Le servitor (%1) non dava acceptation a connexion.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Nomine de usator e contrasigno pro tu conto SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Le servitor non dava acceptation a un adresse vacue de mittente.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Le servitor non dava acceptation a adresse de mittente \"%1\".\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Le message inviante falleva proque le sequente destinatarios esseva refusate "
+"per le servitor:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Le tentativa de initiar invio de contento de message falleva.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr ""
+"Condition de error non maneate. Pro favor tu invia un reporto de defecto "
+"(bug)."
diff -Nru kmailtransport-16.12.3/po/ia/libmailtransport5.po kmailtransport-17.04.3/po/ia/libmailtransport5.po
--- kmailtransport-16.12.3/po/ia/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ia/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,761 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Nico Caprioli, 2012.
+# Giovanni Sora <g.sora@tiscali.it>, 2012, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2013-10-10 14:06+0200\n"
+"Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
+"Language-Team: Interlingua <kde-i18n-ia@kde.org>\n"
+"Language: ia\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.5\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Identificator unic"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Nomine de transporto visibile per le usator"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Le nomine que essera usate quando on refere se a iste servitor."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Innominate"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "Servitor SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Ressource de Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Typo de transporto"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Nomine de hospite del servitor"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Le nomine del dominio o le numeric adresse del servitor SMTP."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Numero de porto del servitor "
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"Le numero del porto ubi SMTP servitor es ascoltate. Le porto predefinite es "
+"25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Nomine de usator requirite pro authentication"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Le nomine de usator que essera inviate al servitor pro autorisation."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Commando que es exequite ante inviar un posta"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Un commando que es exequite localmente, ante de inviar le posta. Isto pote "
+"esser usate pro definir SSH tunnels, per exemplo. Tu lassa illo vacue si "
+"necun commando debe esse exequite"
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Servitor require authentication"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Controla iste option si tu SMTP servitor require authentication ante de dar "
+"acceptation a posta. Isto es cognoscite come 'Authenticate SMTP' o "
+"simplemente ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Immagazina contrasigno"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Controla iste option pro haber tu contrasigno immagazinate.\n"
+"Si KWallet es disponibile tu contrasigno essera immagazinate ibi, que es "
+"considerate secur.\n"
+"Totevia, si KWallet non es disponibile, tu contrasigno essera immagazinate "
+"in le file de configuration. Le contrasigno es immagazinate in un formato "
+"offuscate, ma non debe esser considerate secur per decryptation si accesso "
+"al file de configuration es obtenite."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Methodo de cryptation usate pro communication"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Nulle cryptation"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "Cryptation SSL"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "Cryptation TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Methodo de authentication"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Marca iste option pro usar un nomine de hospite personalisate durante le "
+"identification del servitor de posta. Isto es avantagiose quando le nomine "
+"de hospite del tu systema pote non esser assignate correctemente o pote "
+"mascarar real nomine de hospite de tu sistema."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+"Insere le nomine de hospite que debe esser usate durante le identification "
+"del servitor de posta."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Marca isto option por usar un addresse del expeditor personalisate durante "
+"le identification del servitor de posta. Si non marcate, es usate le adresse "
+"del identitate."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Insere le addresse que debe esser usate pro supplantar le adresse de "
+"mittente predefinite."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Exequente pre-commando"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Exequente pre-commando '%1'."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Impossibile initiar pre-commando '%1'."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Error dum exequente pre-commando '%1'."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Le pre-commando habeva un crash.."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Le pre-commando exiva con codice %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Tu providerea un nomine de usator e un contrasigno pro usa iste servitor de "
+"SMTP."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Incapace de crear SMTP action."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Netta texto"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anonyme"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Incognite"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"Kwallet non es disponibile. Es vermente recommendate de usar KWallet pro "
+"gere tu contrasignos.\n"
+"Totevia, le contrasigno pote esser immagazinate in le file de configuration. "
+"Le contrasigno es immagazinate in un formato offuscate, ma non debe esser "
+"considerate secur per decryptation si accesso al file de configuration es "
+"obtenite.\n"
+"Vole tu immagazinar le contrasigno for servitor '%1' in le file de "
+"configuration?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet Non Es Disponibile"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Immagazina Contrasigno"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Non Immagazina Contrasigno"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Le conto de exito \"%1\"  non es configurate correctemente."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Transporto Predefinite"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Tu debe crear un conto exiente ante inviar."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Crear Conto Nunc?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Crear Conto Nunc"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Configura conto"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Un servitor SMTP in Internet"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Le tranportos de mail sequente immagazina su contrasignos in un file de "
+"configuration non cryptate.\n"
+"Per ration de securitate, pro favor considera de migrar iste contrasignos in "
+"KWallet, le instrumento de KDE pro gestion del portafolio,\n"
+"que immagazina datos notabile per te in un file fortemente cryptate.\n"
+"Vole tu migrar tu contrasignos in KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Demanda"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Migra"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Mantene"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Passo Uno: Selectiona Typo de Transporto"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Nomine:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Rende isto le predefinite exiente conto."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Selectiona typo de conto del lista in basso:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Typo"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Description"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "General"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Information de conto"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, fuzzy, kde-format
+#| msgid "Outgoing mail &server:"
+msgid "Outgoing &mail server:"
+msgstr "&Servitor de posta exiente:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "A&uthentication:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "Contr&asigno:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Le contrasigno que essera inviate al servitor pro autorisation."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Immagazina  contrasigno de SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Servitor &require authentication"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Avantiate"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Configuration de Connexion"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Releva automaticamente"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Iste servitor non supporta authentication"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Cryptation:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Necun"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TSL"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Porto:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Authentication:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Configuration de SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Invia nomine de &hospite personalisate al servitor"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Usa adresse de mittente personalisate"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Adresse de Mittente:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Pre-commando:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "Remo&ve"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Marca como &Predefinite"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "A&dde..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Renomina"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Modifica..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Crea conto exiente"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Crea e configura"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Iste conto de exito non pote esser configurate."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Nomine"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Typo"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr "(Predefinite)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Vole remover conto exiente '%1'?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Remove conto exiente ?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Adde..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Modifica..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Renomina"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Remove"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Marca como Predefinite"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Message vacue."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Message non ha destinatarios."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Message ha transporto invalide."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Message ha le dossier de posta inviate invalide."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Nomine de Hospi&te"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Sendmail local"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Falleva a executar programma de inviar posta %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail exiva de modo anormal."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail exiva de modo anormal: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Un installation local de sendmail"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "&Location de Sendmail:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "&Servitor de posta:"
+
+#~ msgid "Edit..."
+#~ msgstr "Modifica..."
diff -Nru kmailtransport-16.12.3/po/is/kio_smtp.po kmailtransport-17.04.3/po/is/kio_smtp.po
--- kmailtransport-16.12.3/po/is/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/is/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,276 @@
+# translation of kio_smtp.po to Icelandic
+# Icelandic translation of kio_smtp.
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+# Pjetur G. Hjaltason <pjetur@pjetur.net>, 2003.
+# Svanur Palsson <svanur@tern.is>, 2004.
+# Arnar Leosson <leosson@frisurf.no>, 2005.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2005-01-25 19:52-0500\n"
+"Last-Translator: Arnar Leosson <leosson@frisurf.no>\n"
+"Language-Team: Icelandic <kde-isl@molar.is>\n"
+"Language: is\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.9.1\n"
+"Plural-Forms: Plural-Forms: nplurals=2; plural=n != 1;\n"
+"\n"
+"\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Miðlarinn neitaði bæði skipununum EHLO og HELO sem óþekktum eða óútfærðum.\n"
+"Vinsamlegast hafðu sambandi við kerfisstjóra miðlarans."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Óvænt svar miðlara við %1 skipun.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"SMTP þjónninn styður ekki TLS.  Takið TLS úr sambandi ef þú vilt tengjast án "
+"dulritunnar."
+
+#: command.cpp:197
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your SMTP server claims to support TLS, but negotiation was "
+#| "unsuccessful.\n"
+#| "You can disable TLS in KDE using the crypto settings module."
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"SMTP þjónninn segist styðja TLS dulritun, en samningar tókust ekki.\n"
+"Þú getur tekið TLS úr sambandi fyrir KDE í dulritunarstjórneiningunni."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Tenging mistókst"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr ""
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Engar auðkennisupplýsingar gefnar."
+
+#: command.cpp:384
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your SMTP server does not support %1.\n"
+#| "Choose a different authentication method."
+msgid "Choose a different authentication method."
+msgstr ""
+"SMTP þjónninn styður ekki %1.\n"
+"Veldu aðra auðkenniaðferð."
+
+#: command.cpp:386
+#, fuzzy, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr ""
+"SMTP þjónninn styður ekki auðkenningu.\n"
+"%2"
+
+#: command.cpp:387
+#, fuzzy, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr ""
+"SMTP þjónninn styður ekki auðkenningu.\n"
+"%2"
+
+#: command.cpp:391
+#, fuzzy, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"SMTP þjónninn styður ekki auðkenningu.\n"
+"%2"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Auðkenning mistókst.\n"
+"Líklega er lykilorðið rangt.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Gat ekki lesið gögn frá forritinu."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Innihald skeytis ekki samþykkt.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Þjónninn svaraði:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Þjónninn svaraði: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Þetta er tímabundin villa.  Þú getur reynt aftur seinna."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Forritið sendi ógilda fyrirspurn."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Netfang sendanda vantar"
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "Villa í SMTPProtocol::smtp_open (%1)"
+
+#: smtp.cpp:223
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your server does not support sending of 8-bit messages.\n"
+#| "Please use base64 or quoted-printable encoding."
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Miðlarinn þinn styður ekki að senda 8-bita skilaboð.\n"
+"Vinsamlegast notaðu base64 eða quoted-printable stafatöflu."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr ""
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Ógilt SMTP stjórnskeyti (%1) móttekið."
+
+#: smtp.cpp:537
+#, fuzzy, kde-format
+#| msgid ""
+#| "The server did not accept the connection.\n"
+#| "%1"
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Þjóninn samþykkti ekki tenginguna:\n"
+"%1"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Notendanafn og lykilorð fyrir SMTP aðgang þinn:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Þjónnin samþykkti ekki að fá tómt netfang sendanda.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Þjónnin samþykkti ekki netfang sendanda \"%1\".\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Gat ekki sent skeyti þar sem eftirtöldum móttakendum var neitað af miðlara:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Tilraun til að hefja sendingu á innihaldi skeytis mistókst.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Óvænt villutilfelli.  Vinsamlegast sendu inn villutilkynningu."
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "Auðkennis stuðningur er ekki vistþýddur í kio_smtp."
+
+#~ msgid ""
+#~ "Your SMTP server does not support %1.\n"
+#~ "Choose a different authentication method.\n"
+#~ "%2"
+#~ msgstr ""
+#~ "SMTP þjónninn styður ekki %1.\n"
+#~ "Veldu aðra auðkenniaðferð.\n"
+#~ "%2"
+
+#~ msgid ""
+#~ "You have requested to authenticate to the server, but the server does not "
+#~ "seem to support authentication.\n"
+#~ "Try disabling authentication entirely."
+#~ msgstr ""
+#~ "Þú hefur beðið um að verða auðkennd(ur) á þjóninum, en þjóninn virðist "
+#~ "ekki styðja auðkenningar.\n"
+#~ "Prófaðu að slökkva alveg á auðkenningu."
+
+#~ msgid "When prompted, you ran away."
+#~ msgstr "Þegar þú varst spurður, rannst þú af hólmi."
diff -Nru kmailtransport-16.12.3/po/it/docs/kioslave5/smtp/index.docbook kmailtransport-17.04.3/po/it/docs/kioslave5/smtp/index.docbook
--- kmailtransport-16.12.3/po/it/docs/kioslave5/smtp/index.docbook	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/it/docs/kioslave5/smtp/index.docbook	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
+<!ENTITY % addindex "IGNORE">
+<!ENTITY % Italian "INCLUDE"
+> <!-- change language only here -->
+]>
+	
+<article lang="&language;" id="smtp">
+<title
+>smtp</title>
+<articleinfo>
+<authorgroup>
+<author
+>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"
+><firstname
+>Luciano</firstname
+> <surname
+>Montanaro</surname
+> <affiliation
+><address
+><email
+>mikelima@cirulla.net</email
+></address
+></affiliation
+> <contrib
+>Traduzione del documento</contrib
+></othercredit
+> 
+</authorgroup>
+</articleinfo>
+<para
+>Un protocollo per inviare posta dalla stazione di lavoro client ad un server di posta. </para>
+
+<para
+>Vedi: <ulink url="http://cr.yp.to/smtp.html"
+>Simple Mail Transfer Protocol </ulink
+>. </para>
+
+</article>
diff -Nru kmailtransport-16.12.3/po/it/kio_smtp.po kmailtransport-17.04.3/po/it/kio_smtp.po
--- kmailtransport-16.12.3/po/it/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/it/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,237 @@
+# translation of kio_smtp.po to Italian
+# Copyright (C) 2003, 2004, 2005, 2008 Free Software Foundation, Inc.
+#
+# Andrea Rizzi <rizzi@kde.org>, 2003, 2005.
+# Andrea RIZZI <rizzi@kde.org>, 2004.
+# Nicola Ruggero <nicola@nxnt.org>, 2008, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-07-26 10:59+0200\n"
+"Last-Translator: Nicola Ruggero <nicola@nxnt.org>\n"
+"Language-Team: Italian <kde-i18n-it@kde.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Il server ha rifiutato sia il comando EHLO sia il comando HELO come "
+"sconosciuti o non implementati.\n"
+"Per favore, contatta l'amministratore di sistema del server."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Risposta al comando %1 non attesa.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Il server SMTP non supporta TLS. Disabilita\n"
+"TLS, se vuoi connetterti senza crittografia."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Il tuo server SMTP dice di supportare TLS ma la negoziazione non ha avuto "
+"successo. Puoi disabilitare TSL nella finestra impostazioni account SMTP."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Connessione non riuscita"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Errore durante l'autenticazione: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Non è stato fornito alcun dettaglio sull'autenticazione."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Scegli un altro metodo di autenticazione."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Il tuo server SMTP non supporta %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Il tuo server SMTP non supporta (metodo non specificato)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Il tuo server SMTP non supporta l'autenticazione.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Autenticazione non riuscita.\n"
+"Probabilmente la password è sbagliata.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Impossibile leggere i dati dall'applicazione."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Il contenuto del messaggio non è stato accettato.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Il server ha risposto:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Il server ha risposto: «%1»"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Questo è un insuccesso temporaneo. Puoi riprovare più tardi."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "L'applicazione ha mandato una richiesta non valida."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Manca l'indirizzo del mittente."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open non riuscito (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Il tuo server (%1) non supporta la spedizione di messaggi a 8-bit.\n"
+"Per favore utilizza la codifica base64 o quoted-printable."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Scrittura sul socket non riuscita."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "La risposta SMTP ricevuta (%1) non è valida."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Il server (%1) non ha accettato la connessione.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Nome utente e password del tuo account SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Il server non ha accettato l'indirizzo del mittente in bianco:\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Il server non ha accettato l'indirizzo del mittente «%1»\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Spedizione del messaggio non riuscita perché il server ha rifiutato i "
+"seguenti destinatari:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Il tentativo di iniziare la spedizione del contenuto del messaggio non è "
+"riuscito.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr ""
+"Condizione di errore non gestibile. Per favore spedisci una segnalazione di "
+"bug."
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "Il supporto per l'autenticazione non è stato compilato in kio_smtp."
diff -Nru kmailtransport-16.12.3/po/it/libmailtransport5.po kmailtransport-17.04.3/po/it/libmailtransport5.po
--- kmailtransport-16.12.3/po/it/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/it/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,818 @@
+# translation of libmailtransport.po to Italian
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the libmailtransport package.
+# Federico Zenith <federico.zenith@member.fsf.org>, 2007, 2009.
+# Luca Bellonda <lbellonda@gmail.com>, 2008.
+# Pino Toscano <toscano.pino@tiscali.it>, 2009.
+# Luigi Toscano <luigi.toscano@tiscali.it>, 2012, 2013, 2014, 2016, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-03-19 23:15+0100\n"
+"Last-Translator: Luigi Toscano <luigi.toscano@tiscali.it>\n"
+"Language-Team: Italian <kde-i18n-it@kde.org>\n"
+"Language: it\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Lokalize 2.0\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Identificativo univoco"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Nome di trasporto visibile all'utente"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Il nome che sarà usato per riferirsi a questo server."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Senza nome"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "Server SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Risorsa Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Tipo di trasporto"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Nome host del server"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Il nome del dominio o l'indirizzo numerico del server SMTP."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Numero di porta del server"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"Il numero della porta sulla quale è in ascolto il server SMTP. La porta "
+"predefinita è la 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Nome utente necessario per l'accesso"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Il nome utente da inviare al server per l'autorizzazione."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Comando da eseguire prima di inviare un messaggio"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Un comando da eseguire localmente, prima dell'invio di un messaggio. Può "
+"essere usato per configurare un tunnel SSH, per esempio. Lascia stare se non "
+"devi eseguire nessun comando."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Il server richiede l'autenticazione"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Attiva questa opzione se il server SMTP richiede l'autenticazione prima di "
+"ricevere posta. Questo è noto come «SMTP autenticato» o con l'acronimo ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Salva password"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Attiva questa opzione per far salvare la password.\n"
+"Se è disponibile il portafogli di KDE, la password sarà salvata lì, il che è "
+"considerato sicuro.\n"
+"Però, se il portafogli di KDE non è disponibile, la password viene salvata "
+"nel file di configurazione. La password è salvata in un formato difficile da "
+"leggere, ma non dovrebbe essere considerata al sicuro da tentativi di "
+"decifrazione se qualcuno dovesse ottenere accesso al file di configurazione."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Metodo di cifratura usato per la comunicazione"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Nessuna cifratura"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "Cifratura SSL"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "Cifratura TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Metodo di autenticazione"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- DAFARE -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Marca questa opzione per usare un nome host personalizzato quando ti "
+"identifichi sul server di posta. È utile quando il nome host del tuo sistema "
+"potrebbe non essere correttamente impostato o per nascondere il vero nome "
+"host del tuo sistema."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Inserisci il nome host da usare per identificarsi sul server."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Marca questa opzione per usare un indirizzo del mittente personalizzato "
+"quando ti identifichi sul server di posta. Se non è marcata, sarà usato "
+"l'indirizzo associato all'identità."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Inserisci l'indirizzo da usare per sovrascrivere l'indirizzo predefinito del "
+"mittente."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Esecuzione del precomando"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Esecuzione del precomando «%1»."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Impossibile avviare il precomando «%1»."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Errore durante l'esecuzione del precomando «%1»."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Il precomando è andato in crash."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Il precomando è terminato con codice %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr "Devi dare un nome utente e una password per usare questo server SMTP."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Impossibile creare processo SMTP."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Testo in chiaro"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anonimo"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Sconosciuto"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"Il portafogli di KDE non è disponibile. Si raccomanda caldamente di usare il "
+"portafogli di KDE per gestire le password.\n"
+"Tuttavia, la password può essere salvata anche nel file di configurazione. "
+"La password viene salvata in un formato difficile da leggere, ma non "
+"dovrebbe essere considerata al sicuro da tentativi di decifrazione se "
+"qualcuno dovesse ottenere accesso al file di configurazione.\n"
+"Vuoi salvare la password per il server «%1» nel file di configurazione?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "Portafogli di KDE non disponibile"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Salva la password"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Non salvare la password"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "L'account di uscita «%1» non è configurato correttamente."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Trasporto predefinito"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Devi creare un account di uscita prima di inviare."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Crea l'account adesso?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Crea l'account adesso"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Configura account"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Un server SMTP su Internet"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"I trasporti di posta seguenti salvano le password in un file di "
+"configurazione non cifrato.\n"
+"Per ragioni di sicurezza, si raccomanda di migrare le password in KWallet,\n"
+"il sistema di gestione dei portafogli di KDE,\n"
+"che memorizza i tuoi dati sensibili in un file fortemente cifrato.\n"
+"Vuoi far migrare le password al portafogli di KDE?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Domanda"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Migra"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Mantieni"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Passo uno: seleziona il tipo di transporto"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Nome:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Rendi questo account quello predefinito in uscita."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Seleziona il tipo di account dalla lista sottostante:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Tipo"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Descrizione"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Generale"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Informazioni account"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Server per la &posta in uscita:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Nome utente:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "P&assword:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "La password da inviare al server per l'autorizzazione."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Salva la password SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Il server &richiede l'autenticazione"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Avanzate"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Impostazioni di connessione"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Identifica automaticamente"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Questo server non supporta l'autenticazione"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Cifratura:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Nessuna"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Porta:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Autenticazione:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Impostazioni SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "In&via nome host personalizzato al server"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "No&me host:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Usa un indirizzo personalizzato per il mittente"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Indirizzo del mittente:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Precomando:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "R&imuovi"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Impo&sta come predefinito"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "A&ggiungi..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Rinomina"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Modifica..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Crea account di uscita"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Crea e configura"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Controllo della funzionalità non riuscito. Verifica la porta e la modalità "
+"di autenticazione."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Controllo delle funzionalità non riuscito"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Questo account di uscita non può essere configurato."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Nome"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Tipo"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (predefinito)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Vuoi rimuovere l'account di uscita «%1»?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Rimuovi l'account di uscita?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Aggiungi..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Modifica..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Rinomina"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Rimuovi"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Imposta come predefinito"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Messaggio vuoto."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Il messaggio non ha destinatari."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Il messaggio ha un trasporto non valido."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Il messaggio ha una cartella di posta inviata non valida."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Nome hos&t:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Sendmail locale"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Impossibile eseguire il programma di posta %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail è terminato anormalmente."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail è terminato anormalmente: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Un'installazione locale di Sendmail"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "&Posizione di Sendmail:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "&Server di posta:"
+
+#~ msgid "Edit..."
+#~ msgstr "Modifica..."
+
+#~ msgid "text"
+#~ msgstr "testo"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "Controlla &quello che supporta il server"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Metodo di autenticazione"
+
+#~ msgid "&LOGIN"
+#~ msgstr "&LOGIN"
+
+#~ msgid "&PLAIN"
+#~ msgstr "&PLAIN"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "&GSSAPI"
+
+#~ msgid "&NTLM"
+#~ msgstr "&NTLM"
+
+#~ msgid "Message has invalid due date."
+#~ msgstr "Il messaggio ha una scadenza non valida."
+
+#~ msgid "Transport: Sendmail"
+#~ msgstr "Trasporto: Sendmail"
+
+#~ msgid "&Location:"
+#~ msgstr "&Indirizzo:"
+
+#~ msgid "Choos&e..."
+#~ msgstr "Sc&egli..."
+
+#~ msgid "Transport: SMTP"
+#~ msgstr "Trasporto: SMTP"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "Use Sendmail"
+#~ msgstr "Usa Sendmail"
+
+#~ msgid "Only local files allowed."
+#~ msgstr "Sono accettati solo i file locali."
+
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "Aggiungi trasporto"
+
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "Modifica trasporto"
diff -Nru kmailtransport-16.12.3/po/ja/kio_smtp.po kmailtransport-17.04.3/po/ja/kio_smtp.po
--- kmailtransport-16.12.3/po/ja/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ja/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,235 @@
+# Translation of kio_smtp into Japanese.
+# This file is distributed under the same license as the kdebase package.
+# ABE Masanori <maas_abb@ybb.ne.jp>, 2004.
+# Kurose Shushi <md81@bird.email.ne.jp>, 2004.
+# Tadashi Jokagi <elf2000@users.sourceforge.net>, 2005.
+# Yukiko Bando <ybando@k6.dion.ne.jp>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-09-25 19:48-0700\n"
+"Last-Translator: Fumiaki Okushi <okushi@kde.gr.jp>\n"
+"Language-Team: Japanese <kde-jp@kde.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.3\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"サーバは EHLO と HELO の両方を不明または実装されていないコマンドとして拒否し"
+"ました。\n"
+"サーバのシステム管理者に連絡してください。"
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"%1 コマンドに対するサーバからの予期しない応答:\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"お使いの SMTP サーバは TLS をサポートしていません。暗号化なしで接続するには "
+"TLS を無効にしてください。"
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"お使いの SMTP サーバは TLS サポートを宣言していますが、ネゴシエーションに失敗"
+"しました。\n"
+"KDE の暗号設定モジュールで TLS を無効にすることができます。"
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "接続失敗"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "認証中にエラーが発生しました: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "認証の詳細が提供されていません。"
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "他の認証方式を選択してください。"
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "お使いの SMTP サーバは %1 をサポートしていません。"
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "お使いの SMTP サーバは (詳細不明の認証方式) をサポートしていません。"
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"お使いの SMTP サーバは認証をサポートしていません。\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"認証に失敗しました。\n"
+"おそらくパスワードが間違っています。\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "アプリケーションからデータを読むことができませんでした。"
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"メッセージの内容は受け付けられませんでした。\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"サーバの応答:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "サーバの応答: “%1”"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "一時的な失敗です。しばらくたってからやり直してください。"
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "アプリケーションが不正な要求を送信しました。"
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "送信者アドレスがありません。"
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open が失敗しました (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"お使いのサーバ (%1) は 8-bit のメッセージの送信をサポートしていません。"
+"base64 または quoted-printable エンコーディングを使ってください。"
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "ソケットへの書き込みに失敗しました。"
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "無効な SMTP 応答 (%1) を受け取りました。"
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"サーバ (%1) は接続を受け付けませんでした。\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "SMTP アカウントのユーザ名とパスワード:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"サーバは空の送信者アドレスを受け付けませんでした。\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"サーバは送信者アドレス %1 を受け付けませんでした。\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"以下の送信先はサーバによって拒否されたため、メッセージの送信に失敗しました:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"メッセージの内容を送ろうとして、失敗しました。\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "処理できないエラー状態が発生しました。バグレポートを送ってください。"
diff -Nru kmailtransport-16.12.3/po/ja/libmailtransport5.po kmailtransport-17.04.3/po/ja/libmailtransport5.po
--- kmailtransport-16.12.3/po/ja/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ja/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,738 @@
+# Translation of libmailtransport into Japanese.
+# This file is distributed under the same license as the kdepimlibs package.
+# Noboru Sinohara <shinobo@leo.bekkoame.ne.jp>, 2002, 2004.
+# Taiki Komoda <kom@kde.gr.jp>, 2004.
+# Tadashi Jokagi <elf2000@users.sourceforge.net>, 2004, 2005.
+# Shinichi Tsunoda <tsuno@ngy.1st.ne.jp>, 2005.
+# Yukiko Bando <ybando@k6.dion.ne.jp>, 2006, 2007, 2008.
+# Fumiaki Okushi <fumiaki@okushi.com>, 2006.
+# Fumiaki Okushi <okushi@kde.gr.jp>, 2006, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-09-25 20:12-0700\n"
+"Last-Translator: Fumiaki Okushi <okushi@kde.gr.jp>\n"
+"Language-Team: Japanese <kde-jp@kde.org>\n"
+"Language: ja\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "一意の識別子"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "送信手段の表示名"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "このサーバに言及するときに使用する名前です。"
+
+#: kmailtransport/mailtransport.kcfg:18
+#, fuzzy, kde-format
+#| msgid "&Rename"
+msgid "Unnamed"
+msgstr "名前変更(&R)"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP サーバ"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr ""
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "送信手段"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "サーバのホスト名"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "SMTP サーバのドメイン名または数字表記のアドレスです。"
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "サーバのポート番号"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "SMTP サーバが待ち受けているポート番号です。通常は 25 です。"
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "ログインするユーザ名"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "認証のためにサーバに送信するユーザ名です。"
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "メールを送信する前に実行するコマンド"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"メール送信前にローカルで実行するコマンドです。例えば SSH トンネルを設定するた"
+"めに使えます。コマンドを実行しない場合は空欄にしておいてください。"
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "サーバは認証が必要"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"お使いの SMTP サーバがメールを受け入れる前に認証を必要とする場合は、このオプ"
+"ションを有効にしてください。これは「認証付き SMTP」または「ASMTP」として知ら"
+"れています。"
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "パスワードを保存する"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"パスワードを保存する場合、このオプションを有効にしてください。\n"
+"KWallet が利用可能であれば、kWallet にパスワードを保存します。これは安全だと"
+"考えられています。\n"
+"KWallet が利用できない場合は、代わりに設定ファイルにパスワードを保存します。"
+"パスワードは解読しにくいフォーマットで保存されますが、設定ファイルにアクセス"
+"されると解読される可能性があることに注意してください。"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "通信に使用する暗号化方式"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "暗号化なし"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL 暗号"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS 暗号"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "認証方式"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"自分のホスト名としてメールサーバに送るホスト名を指定する場合、このオプション"
+"を有効にしてください。これは、システムのホスト名が正しく設定されていない可能"
+"性がある場合や、本当のホスト名を隠しておきたい場合に役立ちます。"
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "自分のホスト名としてサーバに送るホスト名を入力します。"
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, fuzzy, kde-format
+#| msgid ""
+#| "Check this option to use a custom hostname when identifying to the mail "
+#| "server. This is useful when your system's hostname may not be set "
+#| "correctly or to mask your system's true hostname."
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"自分のホスト名としてメールサーバに送るホスト名を指定する場合、このオプション"
+"を有効にしてください。これは、システムのホスト名が正しく設定されていない可能"
+"性がある場合や、本当のホスト名を隠しておきたい場合に役立ちます。"
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, fuzzy, kde-format
+#| msgid ""
+#| "Enter the hostname that should be used when identifying to the server."
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr "自分のホスト名としてサーバに送るホスト名を入力します。"
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "前コマンドの実行"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "前コマンド <icode>%1</icode> を実行しています。"
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "前コマンド <icode>%1</icode> を実行できませんでした。"
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "前コマンド <icode>%1</icode> を実行しています。"
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "前コマンドがクラッシュしました。"
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "前コマンドはコード %1 で終了しました。"
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr "SMTP サーバを使うには、ユーザ名とパスワードが必要です。"
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "SMTP ジョブを作成できませんでした。"
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr ""
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr ""
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr ""
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet が利用できません。パスワードの管理には KWallet を使うことを強くお勧め"
+"します。\n"
+"しかしながら、代わりに設定ファイルにパスワードを保存することもできます。パス"
+"ワードは解読しにくいフォーマットで保存されますが、設定ファイルにアクセスされ"
+"ると解読されてしまう可能性があることに注意してください。\n"
+"サーバ <resource>%1</resource> のパスワードを設定ファイルに保存しますか？|/|"
+"$[set-answers yes '設定ファイルに保存する(&Y)' no '保存しない(&N)']"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet が利用できません"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "パスワードを保存する"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "パスワードを保存しない"
+
+#: kmailtransport/transportjob.cpp:131
+#, fuzzy, kde-format
+#| msgid "The mail transport \"%1\" is not correctly configured."
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "メール送信手段 “%1” は正しく設定されていません。"
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "デフォルトの送信手段"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr ""
+
+# skip-rule: wallet
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"以下のメール送信手段は、暗号化されていない設定ファイルにパスワードを保存しま"
+"す。\n"
+"セキュリティのために KWallet にパスワードを移すことをお勧めします。\n"
+"KWallet は、取り扱いに慎重を要するデータを強力に暗号化されたファイルに保存し"
+"ます。\n"
+"パスワードを KWallet へ移しますか？"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "質問"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "移す"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "移さない"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "名前:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "タイプ"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "説明"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "全般(&G)"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "ログイン(&L):"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "パスワード(&A):"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "認証のためにサーバに送信するパスワードです。"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "SMTP パスワードを保存する(&S)"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "サーバは認証が必要(&R)"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "詳細(&A)"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "このサーバは認証をサポートしていません"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "暗号化:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "なし(&N)"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "ポート(&P):"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "認証方式:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "ユーザ定義のホスト名をサーバに送る(&D)"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "前コマンド:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "削除(&V)"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "デフォルトにする(&S)"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "追加(&D)..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "名前変更(&R)"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "変更(&M)..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr ""
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, fuzzy, kde-format
+#| msgid "The mail transport \"%1\" is not correctly configured."
+msgid "This outgoing account cannot be configured."
+msgstr "メール送信手段 “%1” は正しく設定されていません。"
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "名前"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "タイプ"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (デフォルト)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, fuzzy, kde-format
+#| msgid "A&dd..."
+msgid "Add..."
+msgstr "追加(&D)..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, fuzzy, kde-format
+#| msgid "&Modify..."
+msgid "Modify..."
+msgstr "変更(&M)..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, fuzzy, kde-format
+#| msgid "&Rename"
+msgid "Rename"
+msgstr "名前変更(&R)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, fuzzy, kde-format
+#| msgid "Remo&ve"
+msgid "Remove"
+msgstr "削除(&V)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, fuzzy, kde-format
+#| msgid "&Set as Default"
+msgid "Set as Default"
+msgstr "デフォルトにする(&S)"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr ""
diff -Nru kmailtransport-16.12.3/po/kk/kio_smtp.po kmailtransport-17.04.3/po/kk/kio_smtp.po
--- kmailtransport-16.12.3/po/kk/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/kk/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,234 @@
+# translation of kio_smtp.po to Kazakh
+#
+# Sairan Kikkarin <sairan@computer.org>, 2005, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2011-01-09 03:50+0600\n"
+"Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
+"Language-Team: Kazakh <kde-i18n-doc@kde.org>\n"
+"Language: kk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Сервер EHLO мен HELO командаларының екеуі де беймәлім не жаратылмаған деп "
+"қабылданбаған.\n"
+"Сервер жүйесінің әкімшісіне қатынаңыз."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"%1 командасына күтпеген сервердің жауабы.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"SMTP серверіңіз TLS протоколын қолдамайды. Шифрлаусыз байланысты қаласаңыз "
+"TLS протоколын бұғаттап қойыңыз."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"SMTP серверіңіз TLS протоколын қолдайтынын жарияласа да, онымен\n"
+"байланысу туралы келісімге келмеді. SMTP тіркелгіні баптау диалогында TSL "
+"протоколын бұғаттап тастауға болады."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Қосылым жаңылды"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Аутентификация кезінде қате пайда болды: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Аутентификацияға керек мәліметтер келтірілмеген."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Басқа аутентификацияның тәсілін таңдаңыз."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "SMTP серверіңіз %1 дегенді танымайды."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "(Келтірілмеген тәсілд) SMTP серверіңіз қолдамайды."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"SMTP серверіңіз аутентификацияны қолдамайды.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Аутентификацияның қатесі.\n"
+"Бәлкім пароль дұрыс келтірілмеген.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Қолданбадан дерек оқылмады."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Хабардың мазмұны қабылданбады.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Сервердің жауабы:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Сервердің жауабы:\"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Бұл уақытша қате. Кейінрек қайталап көріңіз."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Бұл қолданба дұрыс емес, сұранысты жіберді."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Жолдаушының адресі жоқ."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open қатесі (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Серверіңіз (%1) 8-биттік хабарларды жолдауды қолдамайды.\n"
+"Base64 немесе quoted-printable кодтаманың біреуін қолданыңыз."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Сокетке жазу жаңылысы."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Дұрыс емес SMTP жауабы (%1) қабылданған."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Сервер (%1) қосылымды қабылдамады.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "SMTP тіркелгіңіздің пайдаланушысы мен паролі:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Сервер бос жолдаушы адресін қабылдамады.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Сервер \"%1\" жолдаушы адресін қабылдамады.\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Хабарды жолдау кезінде қате пайда болды, себебі келесі адрестердісервер "
+"қабылдамады:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Хабардың мазмұның жіберуде қате пайда болды.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Беймәлім қате жағдайы. Қате туралы хабарлаңыз."
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "kio_smtp компиляциясы аутентификацияны қолдауысыз жасалған."
diff -Nru kmailtransport-16.12.3/po/kk/libmailtransport5.po kmailtransport-17.04.3/po/kk/libmailtransport5.po
--- kmailtransport-16.12.3/po/kk/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/kk/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,743 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Sairan Kikkarin <sairan@computer.org>, 2011, 2012, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2013-09-20 03:53+0600\n"
+"Last-Translator: Sairan Kikkarin <sairan@computer.org>\n"
+"Language-Team: Kazakh <kde-i18n-doc@kde.org>\n"
+"Language: kk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Бірегей идентификаторы"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Пайдаланушыға көрінетін тасымалдауының атауы"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Осы серверге сілтегенде қолданатын атауы."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Атаусыз"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP сервері"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi деректер көзі"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Тасымалдау түрі"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Сервер хостының атауы"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "SMTP серверінің домендік атауы немесе IP-нөмірі."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Сервер портының нөмірі"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "SMTP сервері тыңдайтын порт нөмірі. Әдетте бұл 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Кіру үшін қолданатын Пайдаланушы атауы"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Серверге авторизация үшін жіберілетін Пайдаланушының атауы."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Поштаны жіберу алдында орындалатын команда"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Поштаны жіберу алдында жергілікті орындалатын команда. Мысалы, SSH "
+"туннельдерін орнатуға қолдануға. Қажет болмаса - бос қалдырыңыз."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Сервер аутентификацияны талап етеді"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"SMTP серверіңі, поштаны қабыдаудың алдында, аутентификацияны талап ететін "
+"болса - осыны белгілеңіз. Бұл 'Authenticated SMTP' немесе жәй ASMTP деп "
+"мәлім тетік."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Паролі жаттап алынсын"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Паролі жаттап алынсын десеңіз - осыны белгілеңіз.\n"
+"KWallet қолданыста болса, соған сақталады, бұл қауіпсіз тәсіл.\n"
+"Алайда, KWallet істемесе, онда ол параметрлер файлына шиеленістірген түрде "
+"сақталады, бірақ соған қарамастан, осы файлға бөтендер қатынауы "
+"ықтималдығынан, бұл қауіпсіз тәсіл деп есептелмейді."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Байланысуға қолданатын шифрлау әдісі"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Шифрлаусыз"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL шифрлауы"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS шифрлауы"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Аутентифкация тәсілі"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Пошта серверіңіздің атауы өзгеше жазылсын десеңіз - осыны белгілеңіз. "
+"Жүйелік хост атауы дұрыс орнатылмағанда, немесе оны жасыру үшін қолдануға "
+"болады."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Пошта серверіңіздің атауы ретінде қолданатын хост атауын келтіріңіз."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Пошта срверінде жазылатын жіберушінің адресі әдеттігінен басқа болсын десңіз "
+"- осыны белгілеңіз. Белгісі қойылмаса, адрес іс-әлпеті жазуынан алынады."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr "Әдетті жіберуші адресінің орнына қолданатын адресті келтіріңіз."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Алғашқы, яғни пре-командасын орындау"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "'%1' алғашқы, яғни пре-командасын орындау"
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "'%1' пре-командасы жіберілмеді."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "'%1' пре-командасын орындау қатесі."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Пре-команда қирауға ұшырады."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Пре-команданың шығу коды: %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Бұл SMTP cерверге қатынау үшін пайдаланушының атауы мен паролін келтіру "
+"керек."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "SMTP тапырмасы құрылмады."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Кәдімгі мәтін"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Анонимды"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Беймәлім"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet істемейді. Парольдерді сақтау KWallet-ті қолдану лазым.\n"
+"Оның орнына парольді параметрлер файлында да сақтауға болады. Пароль "
+"оқылмайтын пішімде сақталынады, дегенмен бұл әбден қауіпсіз жол деп санауға "
+"болмайды.\n"
+"'%1' серверіне қатынау пароліңізді параметрлер файлында сақтауды қалайсыз ба?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet қол жеткізбеді"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Парольді сақтау"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Парольді сақтамау"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "\"%1\" жіберетін тіркелгі дұрыс бапталмаған."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Әдетті тасымалдауы"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Жіберуінің алдында шығыс пошта тіркелгісін құру керек."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Тіркелгіні қазір құрасыз ба?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Қазір құру"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Тіркелгіні баптау"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Интернетегі SMTP сервері"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Келесі поштаны тасымалдауы парольдерін параметрлер файлында шифрланбаған "
+"түрде сақтайды.\n"
+"Қауіпсіздік үшін, бұл парольдерді KWallet (KDE әмиян құралы) бағдарламасына "
+"көшіруді қарастырыңыз.\n"
+"Әмиян құпиялы деректі мықтылап шифрланған файлда сақтайды.\n"
+"Парольдеріңізді KWallet-ке көшірмексіз бе?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Сұрақ"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Көшу"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Қала берісн"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "1-қадам: Тасымалдау түрін таңдау"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Атауы:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Осы шығыс пошта тіркелгісі әдетті болсын"
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Төменгі тізімінен тіркелгінің түрін таңдаңыз:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Түрі"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Сипаттамасы"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Жалпы"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Тіркелгі мәліметі"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, fuzzy, kde-format
+#| msgid "Outgoing mail &server:"
+msgid "Outgoing &mail server:"
+msgstr "Шығыс пошта &сервері:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Пайдаланушы:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "П&аролі:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Серверге авторизация үшін жіберілетін паролі."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "SMTP паролі &жаттап алынсын"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Сервер аутентификацияны &талап етеді"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Жетелеу"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Қосылымының параметрлері"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Автобайқау"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Бұл сервер аутентификацияны қолдамайды"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Шифрлауы:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Жоқ"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Порты:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Аутентификациясы:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP параметрлері"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Серверге өзгеше хост атауы жі&берілсін"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Өзгеше жіберуші адресі болсын"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Жіберушінің адресі:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Пре-командасы:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "Ө&шіру"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Әдетті қ&ылу"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "Қ&осу..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Атауын өзгерту"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Өзгерту..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Шығыс пошта тіркелгісін құру"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Құру мен Баптау"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Бұл жіберетін тіркелгі бапталмайды."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Атауы"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Түрі"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Әдетті)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Шығыс '%1' тіркелгісін өшірмексіз бе?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Шығыс тіркелгісі өшірілсін бе?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Қосу..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Өзгерту..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Атауын өзгерту"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Өшіру"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Әдетті қылу"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Мазмұны жоқ хат"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Хат кімге көрсетілмеген"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Хаттың тасымадауы дұрыс емес."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Хаттың жіберілген пошта қапшығы дұрыс емес."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Хос&т атауы:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Жергілікті sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Мынау пошта бағдарламаны орындау жаңылысы: %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail-ден дағдарысты шығу."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail-ден дағдарысты шығуы: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Жергілікті sendmail қызметі"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Sendmail-дың &орналасуы:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "Пошта &сервері:"
diff -Nru kmailtransport-16.12.3/po/km/kio_smtp.po kmailtransport-17.04.3/po/km/kio_smtp.po
--- kmailtransport-16.12.3/po/km/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/km/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,227 @@
+# translation of kio_smtp.po to Khmer
+# Khoem Sokhem <khoemsokhem@khmeros.info>, 2005, 2007, 2008, 2010.
+# Morn Met, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-12-13 09:31+0700\n"
+"Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
+"Language-Team: Khmer <support@khmeros.info>\n"
+"Language: km\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"ម៉ាស៊ីន​បម្រើ​បាន​ច្រាន​ចោលទាំងពាក្យ​បញ្ជា​ EHLO និង HELO និង​ចាត់​ទុក​វា​ជា​ពាក្យ​បញ្ជាមិន​ស្គាល់ ឬ​មិន​បាន​"
+"អនុវត្ត​។\n"
+"សូម​ទាក់​ទង​អ្នក​គ្រប់គ្រង​ប្រព័ន្ធ របស់​ម៉ាស៊ីន​បម្រើ ។"
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"ការ​ឆ្លើយរបស់ម៉ាស៊ីន​បម្រើ​ដែល​មិន​រំពឹង​ទុក​ទៅ​ពាក្យ​បញ្ជា %1 ។\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"ម៉ាស៊ីន​បម្រើ SMTP របស់​អ្នក​មិន​គាំទ្រ TLS ទេ ។ បិទ TLS ប្រសិន​បើ​អ្នក​ចង់​តភ្ជាប់​ដោយ​គ្មាន​ការ​អ៊ិនគ្រីប ។"
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"ម៉ាស៊ីន​បម្រើ SMTP របស់អ្នក​បញ្ជាក់​​​​ថា​គាំទ្រ TLS ប៉ុន្តែ​ការ​ចចារ​មិន​បាន​ជោគជ័យ ។\n"
+"អ្នក​អាច​​បិទ TLS ក្នុ​ង​ការកំណត់​ប្រអប់​គណនី​របស់​ SMTP ។"
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "ការ​តភ្ជាប់​បាន​បរាជ័យ"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "កំហុស​បាន​កើត​ឡើង​កំឡុង​ពេល​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ៖ %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "គ្មាន​សេចក្តី​លម្អិតនៃការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹម​ត្រូវ​បាន​ផ្ដល់​ឲ្យ ។"
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "ជ្រើស​វិធីសាស្ត្រ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ផ្សេង ។"
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "ម៉ាស៊ីនបម្រើ SMTP របស់អ្នក​​មិន​គាំទ្រ %1 ។"
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "ម៉ាស៊ីន​បម្រើ SMTP មិន​គាំទ្រ (វិធីសាស្ត្រ​ដែល​មិន​បានបញ្ជាក់) ។"
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"ម៉ាស៊ីន​បម្រើ SMTP របស់​អ្នក​មិនគាំទ្រ​ការ​ផ្ទៀវផ្ទាត់​ភាពត្រឹមត្រូវ​ទេ ។\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹម​ត្រូវ​បាន​បរាជ័យ ។\n"
+"ទំនង​ជាខុសពាក្យ​សម្ងាត់ ។\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "មិន​អាច​អាន​ទិន្នន័យ​ពី​កម្មវិធី ។"
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"មាតិការបស់សារ មិន​ត្រូវ​បាន​ទទួល​យក ។\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"ម៉ាស៊ីន​បម្រើ​បាន​ឆ្លើយ​តប ៖\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "ម៉ាស៊ីនបម្រើបាន​ឆ្លើយ​តប ៖ \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "នេះ​គឺ​ជា​ការ​បរាជ័យ​បណ្ដោះអាសន្ន ។ អ្នក​អាច​ព្យាយាម​ម្ដង​ទៀត​ពេល​ក្រោយ ។"
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "កម្មវិធី​បានផ្ញើ​សំណើ​មិន​ត្រឹម​ត្រូវ​មួយ ។"
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "អាសយដ្ឋាន​អ្នក​ផ្ញើ​គឺបាត់​បង់ ។"
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open បាន​បរាជ័យ (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"ម៉ាស៊ីន​បម្រើ​ (%1) របស់​អ្នក​មិន​គាំទ្រ​ការ​ផ្ញើ​សារ ៨ ប៊ីត ។\n"
+"សូម​ប្រើ ៦៤ ជា​មូលដ្ឋាន ឬ​ការ​អ៊ិនកូដដកស្រង់​ដែល​អាច​បោះពុម្ពបាន ។"
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "ការ​សរសេរ​ទៅកាន់​រន្ធ​បាន​បរាជ័យ ។"
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "បាន​ទទួល​ការ​ឆ្លើយតប​មិនត្រឹមត្រូវ (%1) របស់ SMTP ។"
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"ម៉ាស៊ីន​បម្រើ​ (%1) មិន​បាន​ទទួល​ការតភ្ជាប់ ។\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "ឈ្មោះ​អ្នក​ប្រើ និង​ពាក្យ​សម្ងាត់ សម្រាប់​គណនី SMTP របស់អ្នក ៖"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"ម៉ាស៊ីន​បម្រើ​មិន​បាន​ទទួល​អាសយដ្ឋាន​អ្នក​ផ្ញើ​ទទេ ។\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"ម៉ាស៊ីន​បម្រើ​មិន​បាន​ទទួល​អាសយដ្ឋានរបស់អ្នក​ផ្ញើ \"%1\" ។\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"ការផ្ញើសារ​បាន​បរាជ័យ ដោយ​ហេតុថាអ្នក​ទទួល​ដូច​ខាង​ក្រោម ត្រូវ​បាន​ច្រាន​ចោល​ដោយ​ម៉ាស៊ីន​បម្រើ ៖\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"ការ​ប៉ុនប៉ង​ដើម្បី​ចាប់​ផ្ដើម​ផ្ញើ​មាតិការបស់សារបាន​បរាជ័យ ។\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "លក្ខខណ្ឌ​កំហុស​មិន​បាន​ដោះស្រាយ​ ។ សូម​ផ្ញើ​របាយការណ៍​កំហុស​មួយ ។​"
diff -Nru kmailtransport-16.12.3/po/km/libmailtransport5.po kmailtransport-17.04.3/po/km/libmailtransport5.po
--- kmailtransport-16.12.3/po/km/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/km/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,829 @@
+# translation of desktop_extragear-utils_kdiff3.po to khmer
+# Khoem Sokhem <khoemsokhem@khmeros.info>, 2008.
+# Eng Vannak <evannak@khmeros.info>, 2008.
+# Morn Met, 2010.
+#  Seng Sutha <Sutha@khmeros.info>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: desktop_extragear-utils_kdiff3\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-12-22 05:05+0700\n"
+"Last-Translator: Seng Sutha <Sutha@khmeros.info>\n"
+"Language-Team: Khmer [km] <Support@khmeros.info>\n"
+"Language: km\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: WordForge 0.8 Beta 1\n"
+"X-Language: km-KH\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "គ្រឿង​សម្គាល់​ដែល​មាន​តែមួយ​"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "ឈ្មោះ​បញ្ជូន​ដែល​អាច​មើល​ឃើញ​​នៃ​អ្នក​ប្រើ​"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "ឈ្មោះ​ដែល​នឹង​ត្រូវ​បានប្រើនៅពេល​សំអាង​លើ​ម៉ាស៊ីន​បម្រើ ។"
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "គ្មាន​ឈ្មោះ"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "ម៉ាស៊ីន​បម្រើ SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "ធន​ធាន Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "ប្រភេទ​ដឹកជញ្ជូន"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "ឈ្មោះ​ម៉ាស៊ីន​​របស់​ម៉ាស៊ីន​បម្រើ"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "ឈ្មោះ​ដែន ឬ​អាសយដ្ឋាន​ជា​លេខ​របស់​​​ម៉ាស៊ីន​បម្រើ SMTP ។"
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "លេខ​ច្រក​​របស់​ម៉ាស៊ីន​បម្រើ"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "លេខ​ច្រក​ដែល​ម៉ាស៊ីន​បម្រើ SMTP កំពុង​តែ​ស្ដាប់ ។ ច្រក​លំនាំដើម​គឺ ២៥ ។"
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "ត្រូវ​ការ​ឈ្មោះ​អ្នក​ប្រើ​ដើម្បី​ចូល"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "ឈ្មោះ​អ្នក​ប្រើ​ដែល​ត្រូវ​ផ្ញើ​ទៅ​ម៉ាស៊ីន​បម្រើ​សម្រាប់​សេចក្ដីអនុញ្ញាត​ ។"
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "ពាក្យ​បញ្ជា​ត្រូវ​ប្រតិបត្តិ​មុន​ពេល​ផ្ញើ​សំបុត្រ"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"ពាក្យ​បញ្ជា​​ដែល​ត្រូវ​ដំណើរការ​​ជា​មូលដ្ឋាន មុន​នឹង​ផ្ញើ​អ៊ីមែល ។ ឧទាហរណ៍ នេះ​អាច​ត្រូវ​បាន​​ប្រើ​ដើម្បី​រៀបចំ​"
+"ធ្យូនែល SSH ។ ទុក​ឲ្យ​វា​ទទេ ប្រសិន​បើ​គ្មាន​ពាក្យ​បញ្ជា​គួរ​រត់ ។"
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "ម៉ាស៊ីន​បម្រើ​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"គូស​ធីក​ជម្រើស​នេះ ប្រសិន​បើ​ម៉ាស៊ីន​ SMTP របស់​​អ្នក​ទាមទារ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​មុន​នឹង​ទទួល​សំបុត្រ ។ វា​"
+"ត្រូវ​បាន​ស្គាល់​ជា 'SMTP ដែល​បាន​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ' ឬ​តាមធម្មតា​ជា ASMTP ។"
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "ទុក​ពាក្យ​សម្ងាត់"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+" គូស​ធីក​ជម្រើស​នេះ​ដើម្បី​ទុក​ពាក្យ​សម្ងាត់​របស់​អ្នក​ ។\n"
+" ប្រសិនបើ​មាន​ KWallet  ពាក្យ​សម្ងាត់​នឹង​ត្រូវ​បាន​ទុក​នៅ​ទីនោះ​ដែល​ត្រូវ​បាន​ចាត់​ទុក​ថា​មាន​សុវត្ថិភាព​ ។\n"
+"​ទោះ​បី​យ៉ាងណា​ ប្រសិនបើ​មិន​មាន​ KWallet  ទេ ពាក្យ​សម្ងាត់​នឹង​ត្រូវ​ទុក​នៅ​ក្នុង​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ ។ "
+"ពាក្យសម្ងាត់​ត្រូវ​បាន​ទុក​នៅ​ក្នុង​ទ្រង់​ទ្រាយ obfuscated  ប៉ុន្តែ​មិន​គួរ​ត្រូវ​បាន​ចាត់​ទុក​ថា​មាន​សុវត្ថិភាព​ពី​កិច្ច​"
+"ប្រឹង​ប្រែង​អ៊ិនគ្រីប​ទេ ប្រសិនបើ​​​មាន​​ការ​ចូល​ដំណើរការ​ទៅ​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ ។     "
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "វិធីសាស្ត្រ​អ៊ិនគ្រីប​ត្រូវ​បាន​ប្រើ​សម្រាប់​ទំនាក់​ទំនង"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "គ្មាន​ការ​អ៊ិនគ្រីប​ឡើយ​​"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "ការអ៊ិនគ្រីប SSL ​"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "ការ​អ៊ិនគ្រីប TLS ​"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "វិធីសាស្ត្រ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"គូស​ធីក​ជម្រើស​នេះ ដើម្បី​ប្រើ​ឈ្មោះ​ម៉ាស៊ីន​ផ្ទាល់ខ្លួន នៅពេល​បញ្ជាក់​ទៅ​កាន់​ម៉ាស៊ីន​បម្រើ​សំបុត្រ ។ វា​មានប្រយោជន៍​"
+"នៅពេល​ឈ្មោះ​ម៉ាស៊ីន​នៃ​ប្រព័ន្ធ​របស់​អ្នក​មិនអាច​ត្រូវ​បានកំណត់​ត្រឹមត្រូវ​ទេ ឬ​សម្គាល់​ឈ្មោះម៉ាស៊ីន​ពិត​នៃ​ប្រព័ន្ធ​របស់​"
+"អ្នក ។"
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "បញ្ចូល​ឈ្មោះ​ម៉ាស៊ីន​ដែល​គួរ​ត្រូវ​បាន​ប្រើ​នៅ​ពេល​បញ្ជាក់​អត្តសញ្ញាណ​ទៅ​ម៉ាស៊ីន​បម្រើ ។"
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"គូស​ធីក​ជម្រើស​នេះ ដើម្បី​ប្រើ​អាសយដ្ឋាន​អ្នក​ផ្ញើ​ផ្ទាល់ខ្លួន នៅ​ពេល​កំណត់​ទៅ​ម៉ាស៊ីន​បម្រើ​អ៊ីមែល ។ ប្រសិនបើ​មិន​"
+"ត្រូវ​បាន​កំណត់​ទេ អាសយដ្ឋាន​អ៊ីមែល​ពី​អត្តសញ្ញាណ​នេះ​នឹង​ត្រូវ​បាន​ប្រើ ។"
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr "បញ្ចូល​អាសយដ្ឋាន​ដែល​គួរតែ​ត្រូវ​បាន​ប្រើ ដើម្បី​សរសេរ​ជាន់​លើ​អាសយដ្ឋាន​អ្នក​ផ្ញើ​លំនាំដើម ។"
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "ការប្រតិបត្តិ​មុន​ពាក្យ​បញ្ជា​​​"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "ការ​ប្រតិបត្តិ​មុន​ពាក្យ​បញ្ជា​​​​ '%1' ។"
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "មិន​អនុញ្ញាត​ទៅ​ចាប់​ផ្ដើម​​មុន​ពាក្យ​បញ្ជា​​ '%1' ។"
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "កំហុស​ខណៈ​ពេល​ដែល​ការប្រតិបត្តិ​មុន​ពាក្យ​បញ្ជា​​​ '%1' ។"
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "មុន​ពាក្យ​បញ្ជា​ដែល​បាន​គាំង​ ។"
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "មុន​ពាក្យ​បញ្ជា​ដែល​បាន​ចេញ​ជាមួយ​​កូដ​​ %1 ។"
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr "អ្នក​ត្រូវ​ផ្គត់ផ្គង់​ឈ្មោះ​អ្នកប្រើ​ និង​ពាក្យ​សម្ងាត់ ដើម្បី​ប្រើ​ម៉ាស៊ីន​បម្រើ SMTP នេះ ។"
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "មិន​អាច​បង្កើត​ការ​ងារ SMTP ។"
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "ជម្រះអត្ថបទ​​"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "អនាមិក​"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "មិន​ស្គាល់​"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet មិន​អាច​រក​បាន ។ វា​ត្រូវ​បាន​ផ្ដល់​អនុសាសន៍​ឲ្យ​ប្រើ KWallet សម្រាប់​គ្រប់គ្រង​ពាក្យសម្ងាត់​របស់​"
+"អ្នក ។\n"
+"ទោះ​ជា​យ៉ាង​ណាក៏​ដោយ ពាក្យ​សម្ងាត់​អាច​ត្រូវ​បាន​ទុក​ក្នុង​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ជំនួស​វិញ ។ ពាក្យ​សម្ងាត់​ត្រូវ​"
+"បាន​ទុក​នៅ​ក្នុងទ្រង់ទ្រាយ​មិន​ច្បាស់ ប៉ុន្តែ​គួរតែ​មិន​ត្រូវ​បាន​ពិចារណា​ថា​មាន​សុវត្ថិភាព​ពី​កា​រឌិគ្រីប ប្រសិន​បើ​ការ​"
+"ចូល​ដំណើរការ​ទៅ​កាន់​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ត្រូវ​បាន​ទទួល ។\n"
+"តើ​អ្នក​ពិត​ជា​ចង់ទុក​ពាក្យ​សម្ងាត់​សម្រាប់​ម៉ាស៊ីន​បម្រើ '%1' នៅ​ក្នុង​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ ឬ​ ?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "មិនមាន KWallet ទេ"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "ទុក​ពាក្យ​សម្ងាត់"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "កុំ​ទុក​ពាក្យ​សម្ងាត់"
+
+#: kmailtransport/transportjob.cpp:131
+#, fuzzy, kde-format
+#| msgid "The mail transport \"%1\" is not correctly configured."
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "ការ​បញ្ជូន​សំបុត្រ \"%1\" មិន​ត្រូវ​បាន​កំណត់​រចនាសម្ព័ន្ធ​ត្រឹមត្រូវ​ទេ ។"
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "ការ​​បញ្ជូន​លំនាំដើម​"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "អ្នក​ត្រូវ​តែ​បង្កើត​គណនី​ចេញ​សិន​មុន​នឹង​ផ្ញើ ។"
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "បង្កើត​គណនី​ឥឡូវ​នេះ​ឬ ?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "បង្កើត​គណនី​ឥឡូវ​នេះ"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "កំណត់រចនាសម្ព័ន្ធ​គណនី​"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "ម៉ាស៊ីន​បម្រើ SMTP ស្ថិត​លើអ៊ីនធឺណិត"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"ការប​ញ្ជូន​សំបុត្រ​ដូចខា​ងក្រោម​ទុក​ពាក្យ​សម្ងាត់​របស់​ពួកវា​នៅ​ក្នុង​ឯកសារ​កំណត់​រចនាសម្ព័ន្ធ​ដែល​មិនបានអ៊ិនគ្រីប ។\n"
+"ដើម្បី​សុវត្ថិភាព សូម​ពិចារណា​ប្ដូរ​ពាក្យ​សម្ងាត់​ទាំងអស់​នេះ​ទៅ KWallet ​ឧបករណ៍​គ្រប់គ្រងកាបូប ​KDE \n"
+"ដែល​ទុក​ទិន្នន័យ​​បម្រែ​បម្រួល​សម្រាប់​អ្នក​ស្ថិតនៅ​ក្នុង​ឯកសារ​ដែល​បានអ៊ិនគ្រីប​យ៉ាង​ខ្លាំង ។\n"
+"តើអ្នក​ចង់​ប្ដូរ​ពាក្យ​សម្ងាត់​របស់​អ្នក​ទៅ KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "សំណួរ"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "ប្ដូរ"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "រក្សា"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "មួយ​ជំហាន​ ៖ ជ្រើស​ប្រភេទ​បញ្ជូន​"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "ឈ្មោះ ៖"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "បង្កើត​គណនី​ចេញ​លំនាំដើម​នេះ​ ។"
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "ជ្រើស​ប្រភេទ​គណនី​ចេញពី​បញ្ជី​ខាងក្រោម​ ៖"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "ប្រភេទ"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "សេចក្តី​ពិពណ៌នា​"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "ទូទៅ"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "ព័ត៌មាន​គណននី"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, fuzzy, kde-format
+#| msgid "Outgoing mail &server:"
+msgid "Outgoing &mail server:"
+msgstr "ម៉ាស៊ីន​បម្រើ​សំបុត្រ​ចេញ ៖"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "ចូល ៖"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "​ពាក្យ​សម្ងាត់ ៖"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "ពាក្យ​សម្ងាត់​ដែល​ត្រូវ​ផ្ញើ​ទៅ​ម៉ាស៊ីន​បម្រើ​សម្រាប់​សេចក្ដី​អនុញ្ញាត ។"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "ទុក​ពាក្យ​សម្ងាត់​របស់ SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "ម៉ាស៊ីន​បម្រើ​ទាមទារ​​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "កម្រិត​ខ្ពស់"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "ការកំណត់​ការតភ្ជាប់​​"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "រកឃើញ​ដោយ​​​ស្វ័យ​ប្រវត្តិ​"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "ម៉ាស៊ីន​បម្រើ​នេះ​មិន​គាំទ្រ​ការ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ​ទេ"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "ការអ៊ិនគ្រីប ៖"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "គ្មាន"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "ច្រក ៖"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "ការ​​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ ៖"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "ការកំណត់​ SMTP ​​"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "ផ្ញើ​ឈ្មោះ​ម៉ាស៊ីន​ផ្ទាល់​ខ្លួន​ទៅ​​ម៉ាស៊ីន​បម្រើ"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "ប្រើ​អាសយដ្ឋាន​អ្នក​ផ្ញើ​ផ្ទាល់ខ្លួន"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "អាសយដ្ឋាន​អ្នក​ផ្ញើ ៖"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "ពាក្យ​បញ្ជាមុន ៖"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "យកចេញ​"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "កំណត់​ជា​លំនាំដើម​"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "បន្ថែម..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "ប្តូរ​ឈ្មោះ​"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "កែប្រែ..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "បង្កើត​គណនី​​ចេញ​"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "កំណត់​រចនាសម្ព័ន្ធ​ និង​បង្កើត​"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, fuzzy, kde-format
+#| msgid "This transport cannot be configured."
+msgid "This outgoing account cannot be configured."
+msgstr "មិន​អាច​កំណត់​រចនាសម្ព័ន្ធ​ការ​បញ្ជូន​នេះ​បាន​ទេ ។"
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "ឈ្មោះ"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "ប្រភេទ"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (លំនាំដើម)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "តើ​អ្នក​ចង់​យក​គណនី​ចេញ '%1' ចេញ​ដែរ​ឬ​ទេ ?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "យក​គណនី​ចេញ​ចេញ​ឬ ?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, fuzzy, kde-format
+#| msgid "A&dd..."
+msgid "Add..."
+msgstr "បន្ថែម..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, fuzzy, kde-format
+#| msgid "&Modify..."
+msgid "Modify..."
+msgstr "កែប្រែ..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, fuzzy, kde-format
+#| msgid "&Rename"
+msgid "Rename"
+msgstr "ប្តូរ​ឈ្មោះ​"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, fuzzy, kde-format
+#| msgid "Remo&ve"
+msgid "Remove"
+msgstr "យកចេញ​"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, fuzzy, kde-format
+#| msgid "&Set as Default"
+msgid "Set as Default"
+msgstr "កំណត់​ជា​លំនាំដើម​"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "សារ​ទទេ ។"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "សារ​គ្មាន​អ្នក​ទទួល ។"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "សារ​បាន​បញ្ជូន​មិន​ត្រឹមត្រូវ​ ។"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "សារ​បាន​ផ្ញើ​ថត​សំបុត្រ​មិន​ត្រឹមត្រូវ​ ។"
+
+#~ msgid "Hos&tname:"
+#~ msgstr "ឈ្មោះ​ម៉ាស៊ីន​ ៖"
+
+#~ msgid "Local sendmail"
+#~ msgstr " sendmail មូលដ្ឋាន​"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ប្រតិបត្តិ​កម្មវិធី​ផ្ញើ​អ៊ីមែល %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail បាន​​ចេញ​ខុស​ពី​ធម្មតា​ ។"
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail បាន​ចេញ​​ខុស​ពី​ធម្មតា​ ៖ %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail​"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "ការដំឡើង​ sendmail ជា​មូលដ្ឋាន"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "ទីតាំង​ Sendmail ៖"
+
+#~ msgid "Mail &server:"
+#~ msgstr "ម៉ាស៊ីន​បម្រើ​សំបុត្រ​ ៖"
+
+#~ msgid "text"
+#~ msgstr "អត្ថបទ​"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "ពិនិត្យ​មើល​អ្វី​ដែល​ម៉ាស៊ីន​បម្រើ​គាំទ្រ"
+
+#~ msgid "Authentication Method"
+#~ msgstr "វិធីសាស្ត្រ​ផ្ទៀងផ្ទាត់​ភាព​ត្រឹមត្រូវ"
+
+#~ msgid "&LOGIN"
+#~ msgstr "ចូល"
+
+#~ msgid "&PLAIN"
+#~ msgstr "PLAIN"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "GSSAPI"
+
+#~ msgid "&NTLM"
+#~ msgstr "NTLM"
+
+#~ msgctxt "Name"
+#~ msgid "Compare/Merge Files/Directories"
+#~ msgstr "ប្រៀបធៀប/បញ្ចូល​ឯកសារ​ចូល​គ្នា/ថត"
+
+#~ msgctxt "Name"
+#~ msgid "Compare/Merge Files/Directories with KDiff3"
+#~ msgstr "ប្រៀបធៀប/បញ្ចូល​ឯកសារ​ចូល​គ្នា/ថត​ជាមួយ KDiff3"
+
+#~ msgctxt "Name"
+#~ msgid "KDiff3"
+#~ msgstr "KDiff3"
+
+#, fuzzy
+#~ msgctxt "GenericName"
+#~ msgid "Diff/Patch Frontend"
+#~ msgstr "Diff/Patch Frontend"
+
+#~ msgctxt "Comment"
+#~ msgid "A File And Directory Comparison And Merge Tool"
+#~ msgstr "ការ​ប្រៀបធៀប​ថត និង​ឯកសារ និង​ឧបករណ៌​បញ្ចូល​គ្នា"
+
+#~ msgctxt "Name"
+#~ msgid "KDiff3Part"
+#~ msgstr "KDiff3Part"
+
+#~ msgid "Transport: Sendmail"
+#~ msgstr "ដឹកជញ្ជូន​ ៖ ផ្ញើ​សំបុត្រ"
+
+#~ msgid "&Location:"
+#~ msgstr "ទីតាំង ៖"
+
+#~ msgid "Choos&e..."
+#~ msgstr "ជ្រើស..."
+
+#~ msgid "Transport: SMTP"
+#~ msgstr "ដឹក​ជញ្ជូន ៖ SMTP"
+
+#~ msgid "1"
+#~ msgstr "១"
+
+#~ msgid "Use Sendmail"
+#~ msgstr "ប្រើ​ ការ​ផ្ញើ​សំបុត្រ"
+
+#~ msgid "Only local files allowed."
+#~ msgstr "អនុញ្ញាត​តែ​ឯកសារ​មូលដ្ឋាន​​ប៉ុណ្ណោះ ។"
+
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "បន្ថែម​ការ​ដឹក​ជញ្ជូន"
+
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "កែប្រែ​ការ​ដឹកជញ្ជូន"
diff -Nru kmailtransport-16.12.3/po/ko/kio_smtp.po kmailtransport-17.04.3/po/ko/kio_smtp.po
--- kmailtransport-16.12.3/po/ko/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ko/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,227 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Shinjo Park <kde@peremen.name>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2014-03-03 00:26+0900\n"
+"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"Language-Team: Korean <kde@peremen.name>\n"
+"Language: ko\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"서버가 HELO, EHLO 명령 둘 다를 알 수 없거나 구현되지 않았다고 보고했습니다.\n"
+"서버 관리자에게 문의하십시오."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"%1 명령에 대한 예상하지 못한 서버 응답입니다.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"SMTP 서버에서 TLS를 지원하지 않습니다. 암호화 없이 연결하려면 TLS를 비활성화"
+"하십시오."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"SMTP 서버에서 TLS 지원을 하는 것처럼 전달하였으나 협상이 실패했습니다.\n"
+"SMTP 계정 설정에서 TLS를 비활성화할 수 있습니다."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "연결 실패"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "인증 중 오류 발생: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "인증 정보를 지정하지 않았습니다."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "다른 인증 방법을 선택하십시오."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "SMTP 서버에서 %1을(를) 지원하지 않습니다."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "SMTP 서버에서 (지정하지 않은 방식)을 지원하지 않습니다."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"SMTP 서버에서 인증을 지원하지 않습니다.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"인증이 실패했습니다.\n"
+"암호가 잘못된 것 같습니다.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "프로그램에서 데이터를 읽을 수 없습니다."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"메시지 내용이 수락되지 않았습니다.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"서버 응답:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "서버 응답: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "임시 오류입니다. 나중에 다시 시도하십시오."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "프로그램에서 잘못된 요청을 보냈습니다."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "보낸 사람 주소가 없습니다."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open 실패 (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"서버(%1)에서 8비트 메시지 전송을 지원하지 않습니다.\n"
+"base64나 quoted-printable 인코딩을 사용하십시오."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "소켓에 쓸 수 없습니다."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "잘못된 SMTP 응답(%1)을 받았습니다."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"서버(%1)에서 연결을 수락하지 못했습니다.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "SMTP 계정의 사용자 이름과 암호:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"서버에서 빈 보낸 사람 주소를 수락하지 못했습니다.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"서버에서 보낸 사람 주소 \"%1\"을(를) 수락하지 못했습니다.\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"다음 수신자가 서버에서 거부당했기 때문에 메시지를 전송할 수 없습니다:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"메시지 내용 전송을 시작할 수 없습니다.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "처리하지 못한 오류 조건입니다. 버그를 보고해 주십시오."
diff -Nru kmailtransport-16.12.3/po/ko/libmailtransport5.po kmailtransport-17.04.3/po/ko/libmailtransport5.po
--- kmailtransport-16.12.3/po/ko/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ko/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,738 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+# Shinjo Park <kde@peremen.name>, 2015, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-12-11 23:12+0100\n"
+"Last-Translator: Shinjo Park <kde@peremen.name>\n"
+"Language-Team: Korean <kde@peremen.name>\n"
+"Language: ko\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 2.0\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "고유 식별자"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "사용자가 읽을 수 있는 전송 방법 이름"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "이 서버를 가리킬 때 사용할 이름입니다."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "이름 없음"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP 서버"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi 자원"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "전송 종류"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "서버의 호스트 이름"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "SMTP 서버의 도메인 이름이나 IP 주소입니다."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "서버의 포트 번호"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "SMTP 서버가 듣고 있는 포트 번호입니다. 기본 포트는 25입니다."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "로그인에 사용할 사용자 이름"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "서버에 인증을 위해서 사용할 사용자 이름입니다."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "메일을 보내기 전에 실행할 명령"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"메일을 보내기 전에 로컬에서 실행할 명령입니다. SSH 터널 등을 설정할 때 사용"
+"할 수 있습니다. 명령을 실행할 필요가 없다면 비워 두십시오."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "서버에 인증이 필요함"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"SMTP 서버에 메일을 보내기 전에 인증하려면 선택하십시오. '인증된 SMTP' 또는 "
+"ASMTP로 불립니다."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "암호 저장"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"암호를 저장하려면 선택하십시오.\n"
+"KWallet을 사용할 수 있으면 안전하게 암호를 저장하기 위해서 사용됩니다.\n"
+"KWallet을 사용할 수 없으면 설정 파일에 암호가 저장됩니다. 암호는 읽을 수 없"
+"는 형태로 저장되지만 설정 파일이 유출되었을 때 복호화할 수도 있습니다."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "대화에 사용할 암호화 방식"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "암호화 없음"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL 암호화"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS 암호화"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "인증 방법"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"이 옵션을 사용하면 메일 서버에 인증할 때 사용자 정의 호스트 이름을 지정할 수 "
+"있습니다. 시스템의 호스트 이름이 잘못 지정되었거나 진짜 호스트 이름을 숨기고 "
+"싶을 때 사용하십시오."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "서버에 인증할 때 사용할 호스트 이름을 입력하십시오."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"이 옵션을 사용하면 메일 서버에 사용할 보낼 사람 주소를 사용자 정의할 수 있습"
+"니다. 선택하지 않으면 프로필의 주소를 사용합니다."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr "기본 보낸 사람 주소 대신 사용할 주소를 입력하십시오."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "사전 명령 실행 중"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "사전 명령 '%1' 실행 중."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "사전 명령 '%1'을(를) 시작할 수 없음."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "사전 명령 '%1' 실행 중 오류 발생."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "사전 명령 충돌함."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "사전 명령이 코드 %1(으)로 종료됨."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr "SMTP 서버에 사용할 사용자 이름과 암호가 필요합니다."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "SMTP 작업을 만들 수 없습니다."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "평문 텍스트"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "익명"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "알 수 없음"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet을 사용할 수 없습니다. 암호를 관리하는 데 KWallet을 사용하는 것을 추천"
+"합니다.\n"
+"설정 파일에 암호를 대신 저장할 수도 있습니다. 암호는 읽을 수 없는 형태로 저장"
+"되지만 설정 파일이 유출되었을 때 복호화할 수도 있습니다.\n"
+"서버 '%1'의 암호를 설정 파일에 저장하시겠습니까?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet 사용 불가"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "암호 저장"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "저장하지 않음"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "보내는 계정 \"%1\"이(가) 올바르게 설정되지 않았습니다."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "기본 전송"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "보내기 전에 전송 계정을 만들어야 합니다."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "지금 계정을 만드시겠습니까?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "지금 계정 만들기"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "계정 설정"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "인터넷의 SMTP 서버"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"다음 메일 전송 도구는 암호를 암호화되지 않은 설정 파일에 저장합니다.\n"
+"보안상의 이유로 KDE 지갑 관리 도구 KWallet에 암호를 저장하는 것을 추천합니"
+"다.\n"
+"이 도구는 암호를 암호화된 파일에 저장합니다.\n"
+"KWallet으로 암호를 이전하시겠습니까?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "질문"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "이전"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "유지"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "1단계: 전송 종류 선택"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "이름:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "기본 보내는 계정으로 설정"
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "아래에서 계정 종류 선택:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "종류"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "설명"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "일반"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "계정 정보"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "보내는 메일 서버(&M):"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "로그인(&L):"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "암호(&A):"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "서버에 인증을 위해서 사용할 사용자 이름입니다."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "SMTP 암호 저장(&S)"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "서버에 인증이 필요함(&R)"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "고급"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "연결 설정"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "자동 감지"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "이 서버에서 인증을 지원하지 않음"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "암호화:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "없음(&N)"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "SSL(&S)"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "TLS(&T)"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "포트(&P):"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "인증:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP 설정"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "서버에 사용자 정의 호스트 이름 보내기(&D)"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "호스트 이름(&M):"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "사용자 정의 보낸 사람 주소 사용"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "보낸 사람 주소:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "사전 명령:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "삭제(&V)"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "기본값으로 저장(&S)"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "추가(&D)..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "이름 바꾸기(&R)"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "수정(&M)..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "보내는 계정 만들기"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "만들고 설정하기"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"사용 가능한 기능을 확인할 수 없습니다. 포트와 인증 모드를 확인하십시오."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "사용 가능한 기능 확인 실패"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "이 보내는 계정을 설정할 수 없습니다."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "이름"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "종류"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (기본값)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "보내는 계정 '%1'을(를) 삭제하시겠습니까?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "보내는 계정 삭제?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "추가..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "수정..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "이름 바꾸기"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "삭제"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "기본값으로 저장"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "메시지가 비었습니다."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "메시지에 받을 사람이 없습니다."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "메시지의 전송 방식이 잘못되었습니다."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "메시지의 보낸 편지함 폴더가 잘못되었습니다."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "호스트 이름(&T):"
+
+#~ msgid "Local sendmail"
+#~ msgstr "로컬 sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "메일 전송 프로그램 %1을(를) 실행할 수 없음"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail이 비정상적으로 종료됨."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail이 비정상적으로 종료됨: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "로컬 Sendmail 설치"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Sendmail 위치(&L):"
+
+#~ msgid "Mail &server:"
+#~ msgstr "메일 서버(&S):"
diff -Nru kmailtransport-16.12.3/po/lt/kio_smtp.po kmailtransport-17.04.3/po/lt/kio_smtp.po
--- kmailtransport-16.12.3/po/lt/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/lt/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,231 @@
+# translation of kio_smtp.po to Lithuanian
+# Donatas Glodenis <dgvirtual@akl.lt>, 2004-2006.
+# Tomas Straupis <tomasstraupis@gmail.com>, 2011.
+# Liudas Alisauskas <liudas@akmc.lt>, 2013.
+# Mindaugas Baranauskas <opensuse.lietuviu.kalba@gmail.com>, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2015-12-29 18:31+0200\n"
+"Last-Translator: Mindaugas Baranauskas <opensuse.lietuviu.kalba@gmail.com>\n"
+"Language-Team: lt <kde-i18n-lt@kde.org>\n"
+"Language: lt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n"
+"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Serveris atmetė tiek EHLO, tiek ir HELO komandas kaip nežinomas arba "
+"neįgyvendintas.\n"
+"Prašome susisiekti su serverio sistemos administratoriumi."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Netikėtas serverio atsakymas į komandą %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Jūsų SMTP serveris nepalaiko TLS. Išjunkite TLS, jei norite prisijungti be "
+"šifravimo."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Jūsų SMTP serveris skelbiasi palaikąs TLS, bet derybos buvo nesėkmingos.\n"
+"Galite išjungti TLS paskyros SMTP nuostatų dialoge."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Prijungimas nepavyko"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Autentifikuojantis įvyko klaida: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Autentikacija nepavyko!"
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Pasirinkite kitą autentikacijos būdą."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Jūsų SMTP serveris nepalaiko %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Jūsų SMTP serveris nepalaiko (nenurodytas metodas)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Jūsų SMTP serveris nepalaiko autentifikavimo.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Autentikacija nepavyko.\n"
+"Tikriausiai yra blogas slaptažodis.\n"
+"Serveris sako: „%1“"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Nepavyko nuskaityti duomenų iš programos."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Laiško turinys nepriimtas.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Serveris atsakė:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Serveris sako: „%1“"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Tai yra laikina nesėkmė. Galite pamėginti vėliau."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Programa išsiuntė neteisingą užklausą."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Nėra siuntėjo adreso."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open triktis (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Jūsų serveris (%1) nepalaiko 8-bitų laiškų siuntimo.\n"
+"Prašome naudoti „base64“ arba „quoted-printable“ koduotes."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Nepavyko rašyti į kanalą."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Gautas neteisingas SMTP atsakas (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Serveris (%1) nepriima prijungimo.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Jūsų SMTP paskyros naudotojas ir slaptažodis:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Serveris nepriima tuščio siuntėjo adreso.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Serveris nepriima siuntėjo adreso „%1“.\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Laiško išsiųsti nepavyko, nes serveris atmetė šiuos gavėjus:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Bandymas pradėti siųsti laiško turinį nepavyko.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Nežinoma klaida. Prašome pateikti pranešimą apie programos klaidą."
diff -Nru kmailtransport-16.12.3/po/lt/libmailtransport5.po kmailtransport-17.04.3/po/lt/libmailtransport5.po
--- kmailtransport-16.12.3/po/lt/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/lt/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,717 @@
+# translation of libmailtransport.po to Lithuanian
+# This file is distributed under the same license as the libmailtransport package.
+# Donatas Glodenis <dgvirtual@akl.lt>, 2007.
+# Remigijus Jarmalavičius <remigijus@jarmalavicius.lt>, 2011.
+# Liudas Alisauskas <liudas@akmc.lt>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2013-08-12 10:46+0300\n"
+"Last-Translator: Andrius Štikonas <andrius@stikonas.eu>\n"
+"Language-Team: Lithuanian <kde-i18n-lt@kde.org>\n"
+"Language: lt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n%10>=2 && (n%100<10 || n"
+"%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n"
+"X-Generator: Poedit 1.5.5\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Unikalus identifikatorius"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Naudotojams matomas perdavimo pavadinimas"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Pavadinimas, kuris bus naudojamas kalbant apie šį serverį."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Be pavadinimo"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP serveris"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi išteklius"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Transporto tipas"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Serverio vardas"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "SMTP serverio domeno vardas ar skaitmeninis adresas"
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Serverio prievado numeris"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "SMTP serverio prievado numeris.  Numatytasis prievadas yra 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Naudotojo vardas prisijungimui"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr ""
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Serveris reikalauja tapatumo nustatymo"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Išsaugoti slaptažodį"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Be šifravimo"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL šifravimas "
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS šifravimas"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Autentifikacijos metodas"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Vykdomos išankstinės komandos"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Vykdomos išankstinė komanda „%1“."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Nepavyksta paleisti išankstinės komandos „%1“."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Klaida vykdant išankstinę komandą „%1“."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr ""
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Norėdami naudotis šiuo SMTP serveriu, Jūs turite pateikti naudotojo vardą ir "
+"slaptažodį."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr ""
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Paprastas tekstas"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anonimas"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Nežinoma"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KDE slaptažodinė nepasiekiama"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Išsaugoti slaptažodį"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Neišsaugoti slaptažodžio"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Klausimas"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Perkėlimas"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Palikti"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Pirmas žingsnis: Pasirinkite perdavimo tipą"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Vardas:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Nustatyti tai numatyta išsiuntimo paskyra."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Pasirinkite paskyros tipą iš žemiau esančio sąrašo:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Tipas"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Aprašymas"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Bendri"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Paskyros informacija"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, fuzzy, kde-format
+#| msgid "Outgoing mail &server:"
+msgid "Outgoing &mail server:"
+msgstr "Išsiunčiamų laiškų &serveris:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Registracijos vardas:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "Sl&aptažodis:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "Iš&saugoti SMTP slaptažodį"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Serveriui &reikia autentikacijos"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Sudėtingesni"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Ryšio nuostatos"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Automatiškai aptikti"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Serveris nepalaiko autentikacijos"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Šifravimas:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Nėra"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Prievadas:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Tapatumo nustatymas:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP nustatymai"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Siųsti &derintą savo mazgo vardą serveriui"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Siuntėjo adresas:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "Pa&šalinti"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Nurodyti kaip numatytą"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "Į&dėti..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "Pe&rvadinti"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Keisti..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Sukurti išsiuntimo paskyrą"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Sukurti ir konfigūruoti"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr ""
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Pavadinimas"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Tipas"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (numatytas)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Pridėti..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Keisti..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Pervadinti"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Pašalinti"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Nustatyti numatytuoju"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr ""
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Ma&zgo vardas:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Nepavyko paleisti pašto programos %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail nenormaliai baigė darbą."
+
+#, fuzzy
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail nenormaliai baigė darbą."
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Sendmail vieta:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "Pašto &serveris:"
diff -Nru kmailtransport-16.12.3/po/lv/kio_smtp.po kmailtransport-17.04.3/po/lv/kio_smtp.po
--- kmailtransport-16.12.3/po/lv/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/lv/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,235 @@
+# translation of kio_smtp.po to Latvian
+# Copyright (C) 2007, 2008, 2010 Free Software Foundation, Inc.
+#
+# Viesturs Zarins <viesturs.zarins@mii.lu.lv>, 2007, 2008, 2010.
+# Maris Nartiss <maris.kde@gmail.com>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-01-05 14:51+0200\n"
+"Last-Translator: Maris Nartiss <maris.kde@gmail.com>\n"
+"Language-Team: Latvian\n"
+"Language: lv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Serveris noraidīja gan EHLO gan HELO komandas kā nezināmas vai "
+"nerealizētas.\n"
+"Lūdzu sazinieties ar servera administrātoru."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Negaidīta servera atbilde uz %1 komandu.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Jūsu SMTP serveris neatbalsta TLS. Atslēdziet TLS, ja vēlaties pieslēgties "
+"bez šifrēšanas."
+
+#: command.cpp:197
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your SMTP server claims to support TLS, but negotiation was "
+#| "unsuccessful.\n"
+#| "You can disable TLS in KDE using the crypto settings module."
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Jūsu SMTP serveris apgalvo ka atbalsta TLS, bet sarunas bija neveiksmīgas.\n"
+"Jūs varat aizliegt TLS lietošanu KDE, izmantojot kripto iestatījumu moduli."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Neizdevās pieslēgties"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Gadījās kļūda autentificējot: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Nav norādītas autentificēšanas detaļas."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Izvēlieties citu autentificēšanās metodi."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Jūsu SMTP serveris neatbalsta %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Jūsu SMTP serveris neatbalsta (nenorādīta metode)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Jūsu SMTP serveris neatbalsta autentificēšanu.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Autentificēšana neveiksmīga.\n"
+"Visticamāk parole ir nepareiza.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Neizdevās nolasīt datus no programmas."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Ziņojuma saturs netika pieņemts.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Serveris teica:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Serveris teica: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Šī ir īstermiņa neveiksme. Jūs varat mēģināt vēlāk vēlreiz."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Programma nosūtīja nederīgu pieprasījumu."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Trūkst sūtītāja adreses."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open neveiksmīgs (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Jūsu serveris (%1) neatbalsta 8-bitu ziņojumu nosūtīšanu.\n"
+"Lūdzu lietojiet base64 vai quoted-printable kodējumu."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Neveiksmīga datu ierakstīšana ligzdā."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Saņemta kļūdaina SMTP atbilde (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Serveris (%1) nepieņēma savienojumu:\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Lietotāja vārds un parole jūsu SMTP kontam:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Serveris nepieņēma sūtītāja adresi:\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Serveris nepieņēma sūtītāja adresi: \"%1\".\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Neizdevās nosūtīt ziņojumu jo serveris noraidīja šos saņēmējus:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Neveiksmīgs mēģinājums sākt sūtīt ziņojuma saturu.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Neapstrādāta kļūdas situācija. Lūdzu nosūtiet kļūdas ziņojumu."
diff -Nru kmailtransport-16.12.3/po/lv/libmailtransport5.po kmailtransport-17.04.3/po/lv/libmailtransport5.po
--- kmailtransport-16.12.3/po/lv/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/lv/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,858 @@
+# translation of libmailtransport.po to Latvian
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Viesturs Zarins <viesturs.zarins@mii.lu.lv>, 2007, 2008, 2010.
+# Maris Nartiss <maris.kde@gmail.com>, 2008, 2009.
+# Viesturs Zariņš <viesturs.zarins@mii.lu.lv>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-01-01 17:14+0200\n"
+"Last-Translator: Viesturs Zarins <viesturs.zarins@mii.lu.lv>\n"
+"Language-Team: Latvian <locale@laka.lv>\n"
+"Language: lv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Unikālais identifikators"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Lietotājam rādāms transporta nosaukums"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Nosaukums, kas tiks lietots runājot par šo serveri."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, fuzzy, kde-format
+#| msgid "&Rename"
+msgid "Unnamed"
+msgstr "Pā&rdēvēt:"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP serveris"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi resurss"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Transporta veids"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Servera resursdatora nosaukums"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "SMTP servera domēna nosaukums vai skaitliskā adrese."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Servera porta numurs"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "Porta numurs, kurā klausās SMTP serveris. Noklusētais ir 25"
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Pieteikšanās lietotāja vārds"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Lietotāja vārds, kuru nosūtīt serverim autorizācijai."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Komanda, ko izpildīt pirms pasta nosūtīšanas"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, fuzzy, kde-format
+#| msgid ""
+#| "\n"
+#| "        A command to run locally, prior to sending email.\n"
+#| "        This can be used to set up SSH tunnels, for example.\n"
+#| "        Leave it empty if no command should be run.\n"
+#| "      "
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"\n"
+"        Komanda, ko izpildīt lokāli pirms pasta nosūtīšanas.\n"
+"        To var izmantot lai, piemēram, atvērtu SSH tuneli.\n"
+"        Atstājiet tukšu, ja neko nav nepieciešams darīt.\n"
+"      "
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Serveris pieprasa autentificēšanu"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, fuzzy, kde-format
+#| msgid ""
+#| "\n"
+#| "        Check this option if your SMTP server requires authentication "
+#| "before accepting mail.\n"
+#| "        This is known as 'Authenticated SMTP' or simply ASMTP.\n"
+#| "      "
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"\n"
+"        Ieslēdziet šo iespēju, ja jūsu SMTP serveris pieprasa "
+"autentificēšanu pirms pasta pieņemšanas.\n"
+"        Tas pir pazīstams kā 'Autentificētais SMTP' vai vienkārši ASMTP.\n"
+"      "
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Saglabāt paroli"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, fuzzy, kde-format
+#| msgid ""
+#| "\n"
+#| "        Check this option to have your password stored.\n"
+#| "        If KWallet is available the password will be stored there which "
+#| "is considered safe.\n"
+#| "        However, if KWallet is not available, the password will be stored "
+#| "in the configuration file.\n"
+#| "        The password is stored in an obfuscated format, but should not be "
+#| "considered secure from decryption efforts if access to the configuration "
+#| "file is obtained.\n"
+#| "      "
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"\n"
+"        Iezlēdziet šo iespēju, lai jūsu parole tiek saglabāta.\n"
+"        Ja ir pieejams KWallet, tā tiks saglabāta tajā, kas tiek uzskatīts "
+"par drošu esam.\n"
+"        Bet, ja KWallet nav pieejams, parole tiks saglabāta konfigurācijas "
+"failā.\n"
+"        Parole tiek saglabāta maskētā pierakstā, bet to nevajadzētu uzskatīt "
+"par kriptogrāfiski drošu, ja iespējams piekļūt konfigurācijas failam.\n"
+"      "
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Saziņai izmantotā šifrēšanas metode"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Nav šifrēšanas"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL šifrēšana"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS šifrēšana"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Autentificēšanas metode"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Ieslēdziet šo iespēju, lai identificējot jūsu pasta serveri, izmantotu "
+"pielāgotu datora nosaukumu. Tas ir lietderīgi, ja jūsu sistēmas datora "
+"nosaukums nav korekts, vai lai slēptu jūsu sistēmas reālo datora "
+"nosaukumu.      "
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Ievadiet datora nosaukumu, jo izmantot servera identificēšanai."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, fuzzy, kde-format
+#| msgid ""
+#| "Check this option to use a custom hostname when identifying to the mail "
+#| "server. This is useful when your system's hostname may not be set "
+#| "correctly or to mask your system's true hostname."
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Ieslēdziet šo iespēju, lai identificējot jūsu pasta serveri, izmantotu "
+"pielāgotu datora nosaukumu. Tas ir lietderīgi, ja jūsu sistēmas datora "
+"nosaukums nav korekts, vai lai slēptu jūsu sistēmas reālo datora "
+"nosaukumu.      "
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, fuzzy, kde-format
+#| msgid ""
+#| "Enter the hostname that should be used when identifying to the server."
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr "Ievadiet datora nosaukumu, jo izmantot servera identificēšanai."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Darbina pirmskomandu"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Darbina pirmskomandu '%1'."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Neizdevās palaist pirmskomandu '%1'."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Kļūda izpildot pirmskomandu '%1'."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Pirmskomanda avarēja."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Primskomanda beidza ar kodu %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Jums jānorāda lietotāja vārds un parole, lai izmantotu šo SMTP serveri."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Neizdevās izveidot SMTP darbu."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr ""
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr ""
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Nezināms"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet nav pieejams. Silti iesakām paroļu glabāšanai izmant KWallet.\n"
+"Tomēr paroli ir iespējams saglabāt arī konfigurācijas failā. Parole tiks "
+"saglabāta maskētā formātā, bet to nevajag uzskatīt par drošu, ja iespējams "
+"piekļūt konfigurācijas failam.\n"
+"Vai vēlaties saglabāt servera '%1' paroli konfigurācijas failā?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet nav pieejams"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Saglabāt paroli"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Nesaglabāt paroli"
+
+#: kmailtransport/transportjob.cpp:131
+#, fuzzy, kde-format
+#| msgid "The mail transport \"%1\" is not correctly configured."
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Pasta transports \"%1\" nav korekti konfigurēts."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Noklusētais transports"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Jums jāizveido pasta nosūtīšanas konts pirms sūtīšanas."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Izveidot tagad kontu?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Izveidot tagad kontu"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Konfigurēt kontu"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "SMTP serveris internetā"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Šie pasta transportu glabā paroles nešifrētā konfigurācijas failā nevis iekš "
+"KWallet.\n"
+"Drošības nolūkiem vēlams visas paroles glabāt iekš KWallet, KDE paroļu "
+"pārvaldības rīka, kas tās glabā spēcīgi šifrētā failā.\n"
+"Vai vēlaties pārcelt jūsu paroles uz KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Jautājums"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Pārcelt"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Paturēt"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Pirmais solis: Izvēlieties transporta veidu"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Nosaukums:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Padarīt šo par noklusēto nosūtīšanas kontu."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Izvēlieties konta tipu no saraksta zemāk:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Veids"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Apraksts"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Pamata"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, fuzzy, kde-format
+#| msgid "Outgoing mail &server:"
+msgid "Outgoing &mail server:"
+msgstr "Izejošā pasta &serveris:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Pieteikšanās:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "P&arole:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Parole, ko nosūtīt uz serveri autentificēšanai."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Saglabāt SMTP paroli"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Serveris &pieprasa autentificēšanu"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Paplašināti"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Serveris neatbalsta autentificēšanu"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, fuzzy, kde-format
+#| msgid "Encryption"
+msgid "Encryption:"
+msgstr "Šifrēšana"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Nav"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Ports:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, fuzzy, kde-format
+#| msgid "Authentication method"
+msgid "Authentication:"
+msgstr "Autentificēšanas metode"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "No&sūtīt serverim pielāgotu datora nosaukumu"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Primskomanda:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "I&zņemt"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Ie&statīt par noklusēto"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "P&ievienot..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "Pā&rdēvēt:"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Mainīt..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Izveidot nosūtīšanas kontu"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Izveidot un konfigurēt "
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, fuzzy, kde-format
+#| msgid "This transport cannot be configured."
+msgid "This outgoing account cannot be configured."
+msgstr "Pasta transportu nevar konfigurēt."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Nosaukums"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Tips"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Noklusējuma)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, fuzzy, kde-format
+#| msgid "Create Outgoing Account"
+msgid "Remove outgoing account?"
+msgstr "Izveidot nosūtīšanas kontu"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, fuzzy, kde-format
+#| msgid "A&dd..."
+msgid "Add..."
+msgstr "P&ievienot..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, fuzzy, kde-format
+#| msgid "&Modify..."
+msgid "Modify..."
+msgstr "&Mainīt..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, fuzzy, kde-format
+#| msgid "&Rename"
+msgid "Rename"
+msgstr "Pā&rdēvēt:"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, fuzzy, kde-format
+#| msgid "Remo&ve"
+msgid "Remove"
+msgstr "I&zņemt"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, fuzzy, kde-format
+#| msgid "&Set as Default"
+msgid "Set as Default"
+msgstr "Ie&statīt par noklusēto"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Tukša vēstule."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Vēstulei nav saņēmēju."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Vēstulei ir nederīgs transports."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Vēstulei ir nederīga nosūtīto vēstuļu mape."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Da&tora nosaukums:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Lokālais sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Neizdevās palaist pasta sūtīšanas programmu %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail beiza ar kļūdu."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail beiza ar kļūdu: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Lokāla sendmail instalācija"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Sendmail &ceļš:"
+
+#, fuzzy
+#~| msgid "Outgoing mail &server:"
+#~ msgid "Mail &server:"
+#~ msgstr "Izejošā pasta &serveris:"
+
+#~ msgid "text"
+#~ msgstr "teksts"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "Pārbaudīt &ko serveris atbalsta"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Autentificēšanas metode"
+
+#~ msgid "&LOGIN"
+#~ msgstr "&LOGIN"
+
+#~ msgid "&PLAIN"
+#~ msgstr "&PLAIN"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "&GSSAPI"
+
+#~ msgid "&NTLM"
+#~ msgstr "&NTLM"
+
+#~ msgid "Message has invalid due date."
+#~ msgstr "Vēstulei ir nederīgs termiņš."
+
+#~ msgid "Transport: Sendmail"
+#~ msgstr "Transports: Sendmail"
+
+#~ msgid "&Location:"
+#~ msgstr "&Vieta:"
+
+#~ msgid "Choos&e..."
+#~ msgstr "Izvēlēti&es..."
+
+#~ msgid "Transport: SMTP"
+#~ msgstr "Transports: SMTP"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "Use Sendmail"
+#~ msgstr "Lietot sendmail"
+
+#~ msgid "Only local files allowed."
+#~ msgstr "Atļauti tikai lokāli faili."
+
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "Pievienot transportu"
+
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "Rediģēt transportu"
diff -Nru kmailtransport-16.12.3/po/mr/kio_smtp.po kmailtransport-17.04.3/po/mr/kio_smtp.po
--- kmailtransport-16.12.3/po/mr/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/mr/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,199 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Chetan Khona <chetan@kompkin.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2013-04-02 13:57+0530\n"
+"Last-Translator: Chetan Khona <chetan@kompkin.com>\n"
+"Language-Team: Marathi <kde-i18n-doc@kde.org>\n"
+"Language: mr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "जुळवणी अपयशी"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr ""
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr ""
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "वेगळी अधिप्रमाणन पद्धती निवडा."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr ""
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr ""
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr ""
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr ""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr ""
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr ""
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr ""
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr ""
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr ""
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr ""
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "तुमच्या SMTP खात्याकरिता वापरकर्तानाव व गुप्तशब्द :"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr ""
diff -Nru kmailtransport-16.12.3/po/mr/libmailtransport5.po kmailtransport-17.04.3/po/mr/libmailtransport5.po
--- kmailtransport-16.12.3/po/mr/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/mr/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,689 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Chetan Khona <chetan@kompkin.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2013-03-25 17:47+0530\n"
+"Last-Translator: Chetan Khona <chetan@kompkin.com>\n"
+"Language-Team: Marathi <kde-i18n-doc@kde.org>\n"
+"Language: mr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Lokalize 1.5\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr ""
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr ""
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "निनावी"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP सर्व्हर :"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr ""
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr ""
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr ""
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr ""
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr ""
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "अधिप्रमाणन पद्धती"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr ""
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr ""
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "पाठ्य खोडा"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "निनावी"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "अपरिचीत"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr ""
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr ""
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr ""
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "प्रश्न"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "ठेवा"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "नाव :"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "प्रकार"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "वर्णन"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "सामान्य"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "प्रवेश (&L):"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "गुप्तशब्द (&A):"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr ""
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "प्रगत"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "स्वयं शोधा"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "कुटलिपी :"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "काही नाही (&N)"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "पोर्ट (&P):"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "अधिप्रमाणन :"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "काढून टाका (&V)"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "मूलभूतसारखे निश्चित करा (&S)"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "जोडा (&D)..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "नाव बदला (&R)"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "बदला (&M)..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr ""
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr ""
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "नाव"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "प्रकार"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (मूलभूत)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "जोडा..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "बदला..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "नाव बदला"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "काढून टाका"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "मूलभूतसारखे निश्चित करा"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr ""
+
+#~ msgid "Hos&tname:"
+#~ msgstr "यजमान नाव (&T):"
diff -Nru kmailtransport-16.12.3/po/nb/kio_smtp.po kmailtransport-17.04.3/po/nb/kio_smtp.po
--- kmailtransport-16.12.3/po/nb/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/nb/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,231 @@
+# Translation of kio_smtp to Norwegian Bokmål
+#
+# Bjørn Steensrud <bjornst@skogkatt.homelinux.org>, 2007, 2008, 2009, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-02-20 15:47+0100\n"
+"Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
+"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: nb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Environment: kde\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Tjeneren avviste både «EHLO» og «HELO»-kommandoene som ukjent eller ikke "
+"implementert.\n"
+"Kontakt tjenerens systemadministrator."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Uventet tjenersvar på kommandoen %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Din SMTP-tjener støtter ikke TLS. Slå av TLS om du vil koble til uten "
+"kryptering."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Din SMTP-tjener påstår at den støtter TLS, men forhandlinga var mislykket.\n"
+"Du kan slå av TLS i oppsettsdialogen for SMTP-konto."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Tilkobling lyktes ikke"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Det oppsto en feil under autentisering: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Det er ikke oppgitt noen autentiseringsdetaljer."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Velg en annen autentiseringsmetode."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Din SMTP-tjener støtter ikke %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Din SMTP-tjener støtter ikke (uspesifisert metode)"
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Din SMTP-tjener støtter ikke autentisering.\n"
+"  %1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Autentisering mislyktes.\n"
+"Sannsynligvis er passordet feil.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Klarte ikke lese data fra programmet."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Meldingsinnholdet ble ikke godtatt.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Tjeneren svarte:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Tjeneren svarte: «%1»"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Dette er en midlertidig svikt. Du kan forsøke igjen senere."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Programmet sendte etn ugyldig forespørsel."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Senderadressen mangler."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open feilet (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Tjeneren din (%1) støtter ikke sending av 8-bit meldinger.\n"
+"Bruk kodingen base64 eller quoted-printable."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Klarte ikke skrive til sokkel."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Ugyldig SMTP-svar (%1) mottatt."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Tjeneren (%1) godtok ikke tilkoblingen.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Brukernavn og passord for din SMTP-konto:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Tjeneren godtok ikke en tom sender-adresse.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Tjeneren godtok ikke senderadressen «%1».\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Meldingssending mislyktes fordi tjeneren avviste følgende mottakere:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Forsøk på å starte meldingens innhold mislyktes.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Ubehandlet feilsituasjon. Vennligst send feilrapport."
diff -Nru kmailtransport-16.12.3/po/nb/libmailtransport5.po kmailtransport-17.04.3/po/nb/libmailtransport5.po
--- kmailtransport-16.12.3/po/nb/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/nb/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,723 @@
+# Translation of libmailtransport5 to Norwegian Bokmål
+#
+# Bjørn Steensrud <bjornst@skogkatt.homelinux.org>, 2007, 2008, 2009, 2010, 2012, 2013, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2014-09-23 22:07+0200\n"
+"Last-Translator: Bjørn Steensrud <bjornst@skogkatt.homelinux.org>\n"
+"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
+"Language: nb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Environment: kde\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Entydig identifikasjon"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Brukersynlig transportnavn"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Navnet som skal brukes når det vises til denne tjeneren."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Uten navn"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP-tjener"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadiressurs"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Transporttype"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Vertsnavn for tjeneren"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Domenenavnet eller den numeriske adressen til SMTP-tjeneren."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Portnummer til tjeneren"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "Portnummeret som SMTP-tjeneren lytter til. Standardporten er 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Brukernavn som trengs for innlogging"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Brukernavnet som skal sendes til tjeneren for autorisering."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Kommando som skal kjøres før det sendes en e-post"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"En kommando som skal kjøres lokalt, før e-post sendes. Dette kan f.eks. "
+"brukes til å sette opp SSH-tunneler.  La det være tomt hvis ingen kommando "
+"skal kjøres."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Tjeneren krever autentisering"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Kryss av her hvis din SMTP-tjener krever autentisering før den tar i mot e-"
+"post.  Dette er kjent som 'Autentisert SMTP' eller bare ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Lagre passord"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Kryss av her for å la KMail lagre passordet.\n"
+"Hvis KWallet er tilgjengelig vil passordet bli lagret i KWallet hvor det er "
+"regnet som sikkert.\n"
+"Men dersom KWallet ikke er tilgjengelig vil passordet bli lagret i KMails "
+"oppsettsfil. Passordet vil bli lagret i et sært format, men burde ikke "
+"regnes som sikkert fra dekrypteringsforsøk dersom noen oppnår tilgang til "
+"oppsettsfila."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Krypteringsmetode for kommunikasjon"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Ingen kryptering"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL-kryptering"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS-kryptering"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Autentiseringsmetode"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Kryss av her for å bruke et selvvalgt vertsnavn til identifikasjon mot e-"
+"posttjeneren. Dette er nyttig hvis vertsnavnet til systemet ditt ikke er "
+"satt riktig eller til å maskere systemets virkelige vertsnavn."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Oppgi vertsnavn som skal brukes til identifikasjon mot tjeneren."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Kryss av her for å bruke en selvvalgt senderadresse til identifikasjon mot e-"
+"posttjeneren. Hvis det ikke er krysset av blir adressen fra identiteten "
+"brukt."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Oppgi adressen som skal brukes til å overskrive standard senderadresse."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Kjører forkommando"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Kjører forkommandoen «%1»."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Kan ikke starte forkommandoen «%1»."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Feil oppsto mens forkommandoen «%1» kjørte."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Forkommandoen krasjet."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Forkommandoen avsluttet med kode %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Du må angi et brukernavn og et passord for å få tilgang til denne SMTP-"
+"tjeneren."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Klarte ikke opprette SMTP-jobb."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 nr. %2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Klartekst"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anonym"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Ukjent"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet er ikke tilgjengelig. Det anbefales på det sterkeste å bruke KWallet "
+"til å holde styr på passordene.\n"
+"Passordet kan lagres i oppsettsfila i stedet. Passordet lagres i et "
+"forvrengt format, men bør ikke anses som sikkert mot dekryptering hvis noen "
+"får tilgang til oppsettsfila.\n"
+"Vil du lagre passordet for tjeneren «%1» i oppsettsfila?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet er ikke tilgjengelig"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Lagre Passord"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Ikke lagre passord"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Sendingskontoen «%1» er ikke satt opp riktig."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Standardtransport"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Du må lage en sendingskonto før du sender."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Opprette konto nå?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Opprett konto nå"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Sett opp konto"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "En SMTP-tjener på Internett"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Følgende e-posttransportmetoder lagrer passordene i oppsettsfila i stedet "
+"for i KWallet.\n"
+"Det anbefales å bruke KWallet til passordlagring, av sikkerhetsgrunner. "
+"KWallet lagrer\n"
+"sensitive data for deg i en fil med sterk kryptering.\n"
+"Vil du at passordene skal flyttes over til KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Spørsmål"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Flytt"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Behold"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Steg 1: velg tranporttype"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Navn :"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Gjør denne til standard sendingskonto."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Velg en kontotype fra lista nedenfor:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Type"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Beskrivelse"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Generelt"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Kontoinformasjon"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Login:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "P&assord:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Passordet som skal sendes til tjeneren for autorisering."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "Lagre SMTP &passordet"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Tjeneren &krever autentisering"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Avansert"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Innstillinger for tilkopling"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Auto-oppdag"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Denne tjeneren støtter ikke autentisering"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Kryptering:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Ingen"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Autentisering:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP-innstillinger"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Sen&d tilpasset vertsnavn til tjeneren"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Bruk egendefinert senderadresse"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Senderadresse:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Forkommando:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "Fj&ern"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "&Sett som Standard"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "&Legg til …"
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "Gi &nytt navn"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Endre …"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Opprett sendingskonto"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Opprett og sett opp"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Klarte ikke kontrollere muligheter. Se til at port og autentiseringsmåte er "
+"riktig."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Klarte ikke kontrollere muligheter"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Denne sendingskontoen kan ikke settes opp."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Navn"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Type"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Standard)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Er det sikkert at du vil fjerne sendingskonto %1?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Fjerne sendingskonto?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Legg til …"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Endre …"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Endre navn"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Fjern"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Velg som standard"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Tom melding."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Meldingen har ingen mottakere."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Meldingen har ugyldig transport."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Meldingen har ugyldig mappe for sendt e-post."
diff -Nru kmailtransport-16.12.3/po/nds/kio_smtp.po kmailtransport-17.04.3/po/nds/kio_smtp.po
--- kmailtransport-16.12.3/po/nds/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/nds/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,236 @@
+# Translation of kio_smtp.po to Low Saxon
+# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+# Heiko Evermann <heiko@evermann.de>, 2004.
+# Sönke Dibbern <s_dibbern@web.de>, 2005, 2006, 2007, 2008.
+# Manfred Wiese <m.j.wiese@web.de>, 2009, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-03-12 05:39+0100\n"
+"Last-Translator: Manfred Wiese <m.j.wiese@web.de>\n"
+"Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
+"Language: nds\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"De Server hett de EHLO- un HELO-Befehlen beed torüchwiest un gifft an, dat "
+"se nich begäng oder nich inbuut sünd.\n"
+"Bitte snack mit den Systeempleger vun den Reekner."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Nich verwacht Serverantwoort op Befehl \"%1\":\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Dien SMTP-Server ünnerstütt TLS nich. Maak TLS ut, wenn Du Di ahn Verslöteln "
+"tokoppeln wullt."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"De SMTP-Server gifft an, dat he TLS ünnerstütt, man dat Uthanneln is "
+"fehlslaan.\n"
+"Du kannst TLS in de Instellen för dat SMTP-Konto utmaken."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Tokoppeln fehlslaan"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Bi de Identiteetprööv geev dat en Fehler: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Keen Angaven för de Identiteetprööv praatstellt."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Söök bitte en anner Anmellmetood ut."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Dien SMTP-Server ünnerstütt %1 nich."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Dien SMTP-Server ünnerstütt (nich angeven Metood) nich."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Dien SMTP-Server ünnerstütt de Identiteetprööv nich.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Identiteetprööv fehlslaan.\n"
+"Wohrschienlich is dat Passwoort leeg.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Daten ut Programm laat sik nich lesen."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"De Narichtinholt wöör afwiest.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"De Server hett antert:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "De Server hett antert: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Dit is en temporere Fehler. Versöök dat man later nochmaal."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Dat Programm hett en Anfraag sendt, de nich gellt."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "De Afsennadress fehlt."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "\"SMTPProtocol::smtp_open\" fehlslaan (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Dien Server (%1) ünnerstütt dat Sennen vun 8Bit-Narichten nich.\n"
+"Bitte bruuk \"base64\" oder \"quoted-printable\" as Koderen."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Schrieven na Socket fehlslaan."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "SMTP-Antwoort (%1) gellt nich."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"De Server (%1) hett dat Tokoppeln afwiest.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Brukernaam un Passwoort för Dien SMTP-Konto:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"De Server nimmt keen leddige Afsennadress an.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"De Server nimmt de Afsennadress \"%1\" nich an.\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Dat Sennen vun de Naricht is fehlslaan, wiel disse Adressaten vun den Server "
+"afwiest wöörn:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Dat Sennen vun den Narichtinholt is fehlslaan.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Nich affungen Fehler. Schick bitte en Fehlerbericht in."
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "Identiteetprööv-Ünnerstütten is nich na kio_smtp inkompileert."
diff -Nru kmailtransport-16.12.3/po/nds/libmailtransport5.po kmailtransport-17.04.3/po/nds/libmailtransport5.po
--- kmailtransport-16.12.3/po/nds/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/nds/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,754 @@
+# Translation of libmailtransport.po to Low Saxon
+# translation of libmailtransport.po to Low Saxon
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+# Sönke Dibbern <s_dibbern@web.de>, 2007, 2008, 2009, 2014.
+# Manfred Wiese <m.j.wiese@web.de>, 2009, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2014-08-13 00:22+0200\n"
+"Last-Translator: Sönke Dibbern <s_dibbern@web.de>\n"
+"Language-Team: Low Saxon <kde-i18n-nds@kde.org>\n"
+"Language: nds\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Eenkennig Beteker"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Wiesnaam"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "De Naam, de för dissen Server bruukt warrt"
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Ahn Naam"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP-Server"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi-Ressource"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Överdreegmetood"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Reeknernaam vun den Server"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "De Domäännaam oder numeersche Adress vun den SMTP-Server"
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Portnummer op den Server"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"De Port, achter de de SMTP-Server luustern deiht. De Standardport is 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Brukernaam för't Anmellen"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "De Brukernaam, de den Server bi't Anmellen tostüert warrt"
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Befehl, de ehr't Loosstüern vun Nettpost utföhrt warrt"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"En Befehl, de vör't Loosstüern vun Nettbreven lokaal utföhrt warrt. As "
+"Bispill kannst Du Dor en SSH-Tunnel mit opstellen. Wenn Du keen Befehl "
+"utföhren wullt, lettst Du dat Feld leddig."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Server bruukt Identiteetprööv"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Maak dit an, wenn Dien SMTP-Server de Identiteet pröövt, ehr he Nettbreven "
+"annimmt. Dit warrt »Authenticated SMTP« oder eenfach »ASMTP« nöömt."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Passwoort wohren"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Maak dit an, wenn Du dat Passwoort wohrt hebben wullt.\n"
+"Is de Knipp verföögbor, warrt dat Passwoort dor binnen wohrt, wat seker noog "
+"is.\n"
+"Is de elektroonsche Knipp nich verföögbor, warrt dat Passwoort binnen de "
+"Instellendatei wohrt. Dat steiht dor in en nich leesbor Formaat binnen, man "
+"wenn Een de Datei faatkriggt un dat Passwoort redig opslöteln will, is dat "
+"Formaat nich seker."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Verslötelmetood för de Kommunikatschoon"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Keen Verslöteln"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL-Verslöteln"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS-Verslöteln"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Identiteetprööv-Metood"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Maak dit an, wenn Du bi't Anmellen för den Nettpostserver en besünner "
+"Reeknernaam bruken wullt. Dat is denn goot, wenn Dien Reeknernaam nich "
+"propper instellt is oder wenn Du den Naam vun Dien Reekner nich künnigmaken "
+"wullt.        "
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Giff hier den Reeknernaam in, den Du bi't Anmellen angeven wullt."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Maak dit an, wenn Du bi't Anmellen för den Nettpostserver en besünner "
+"Afsenneradress bruken wullt. Is dit utmaakt, warrt de Standardadress bruukt."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Giff hier de Adress in, de Du ansteed de Standard-Afsennadress bruken wullt."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Vörwegbefehl warrt utföhrt"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Vörwegbefehl \"%1\" warrt utföhrt."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Vörwegbefehl \"%1\" lett sik nich utföhren."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Fehler bi't Utföhren vun Vörwegbefehl \"%1\"."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "De Vörwegbefehl is afstört."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "De Vörwegbefehl hett den Kode %1 torüchgeven."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Du muttst Brukernaam un Passwoort angeven, wenn Du dissen SMTP-Server bruken "
+"wullt."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "SMTP-Opgaav lett sik nich opstellen."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 Nr. %2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Eenfach Text"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anonüm"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Nich begäng"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet is nich verföögbor. Dat is redig anraadt, dat Du de elektroonsche "
+"Knipp för't Plegen vun Dien Passwöör bruukst.\n"
+"Dat Passwoort lett sik ok binnen de Instellendatei wohren. Dat steiht dor in "
+"en nich leesbor Formaat binnen, man wenn Een de Datei faatkriggt un dat "
+"Passwoort redig opslöteln will, is dat Formaat nich bannig seker.\n"
+"Wullt Du dat Passwoort för den Server \"%1\" binnen de Instellendatei sekern?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet nich verföögbor"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Passwoort sekern"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Passwoort nich sekern"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Dat Loosstüerkonto \"%1\" is nich propper instellt."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Standard-Överdreegmetood"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Du muttst ehr't Loosstüern dor en Konto för inrichten."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Konto nu opstellen?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Konto nu opstellen"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Konto inrichten"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "En SMTP-Server in't Internet"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Disse Överdreegmetoden wohrt ehr Passwöör binnen en nich verslötelt "
+"Instellendatei un nich binnen KWallet.\n"
+"För de Sekerheit weer dat redig beter, wenn Du disse Passwöör na KWallet, "
+"den KDE-Pleger för elektroonsche Knippen, överdregen deest. KWallet wohrt "
+"Dien Daten binnen en deegt verslötelt Datei.\n"
+"Wullt Di Dien Passwöör nu na KWallet överdregen?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Fraag"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Binnen KWallet"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "So laten"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Schritt een: Överdreegmetood utsöken"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Naam:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Dit as Standard-Konto för't Loosstüern bruken"
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Ut de List nerrn en Kontotyp utsöken:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Typ"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Beschrieven"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Allmeen"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Konto-Informatschonen"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, fuzzy, kde-format
+#| msgid "Outgoing mail &server:"
+msgid "Outgoing &mail server:"
+msgstr "Loosstüer-&Server:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Brukernaam:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "&Passwoort:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Dat Passwoort, dat den Server bi't Anmellen tostüert warrt"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "SMTP-Passwoort &wohren"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Server p&röövt Identiteet"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Verwiedert"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Verbinnen instellen"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Autom. opdecken"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Disse Server pröövt de Identiteet nich"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Verslöteln:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Keen"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Identiteetprööv:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP-Instellen"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "&Fastleggt Reeknernaam den Server tostüern"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Besünner Afsennadress bruken"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Afsennadress:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Vörwegbefehl:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Wegmaken"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "As &Standard fastleggen"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "&Tofögen..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "Ü&mnömen"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "Ä&nnern..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Loosstüerkonto opstellen"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Opstellen un inrichten"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Dat Könen lett sik nich utproberen. Prööv bitte de Port un de "
+"Identiteetprööv-Metood."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Könenprööv fehlslaan"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Dit Loosstüerkonto lett sik nich instellen."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Naam"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Typ"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Standard)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Wullt Du Loosstüerkonto \"%1\" redig wegmaken?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Loosstüerkonto wegmaken?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Tofögen..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Ännern..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Ümnömen"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Wegmaken"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "As Standard fastleggen"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Naricht is leddig."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Naricht hett keen Adressaat."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Naricht bruukt leeg Överdreegmetood."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Naricht hett leeg Orner för loosstüert Narichten."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Ree&knernaam:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Lokaal sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Dat Nettpostprogramm \"%1\" lett sik nich opropen"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail wöör nich normaal beendt."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail wöör nich normaal beendt: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "En lokaal Sendmail-Installeren"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Sendmail sien &Steed:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "Nettpost&server:"
diff -Nru kmailtransport-16.12.3/po/nl/docs/kioslave5/smtp/index.docbook kmailtransport-17.04.3/po/nl/docs/kioslave5/smtp/index.docbook
--- kmailtransport-16.12.3/po/nl/docs/kioslave5/smtp/index.docbook	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/nl/docs/kioslave5/smtp/index.docbook	2017-07-11 00:26:21.000000000 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
+<!ENTITY % addindex "IGNORE">
+<!ENTITY % Dutch "INCLUDE"
+> <!-- change language only here -->
+]>
+	
+<article lang="&language;" id="smtp">
+<title
+>smtp</title>
+<articleinfo>
+<authorgroup>
+<author
+>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+&Otto.Bruggeman;&Rinse.Devries; 
+</authorgroup>
+</articleinfo>
+<para
+>Een protocol om e-mail te versturen van de clientcomputer naar de e-mailserver. </para>
+
+<para
+>Zie <ulink url="http://cr.yp.to/smtp.html"
+>Simple Mail Transfer Protocol </ulink
+>. </para>
+
+</article>
diff -Nru kmailtransport-16.12.3/po/nl/kio_smtp.po kmailtransport-17.04.3/po/nl/kio_smtp.po
--- kmailtransport-16.12.3/po/nl/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/nl/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,235 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Freek de Kruijf <freekdekruijf@kde.nl>, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-04-04 12:53+0200\n"
+"Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
+"Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"De server verwierp zowel het commando EHLO alsook HELO als onbekend of niet "
+"geïmplementeerd.\n"
+"Neem contact op met de systeembeheerder van deze server."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Onverwachte serverreactie op commando %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Uw SMTP-server ondersteunt geen TLS. Schakel TLS uit in de "
+"configuratiemodule \"Privacy en beveiliging->Cryptografie\" als u zonder "
+"versleuteling wilt verbinden."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Uw SMTP-server zegt TLS te ondersteunen, maar de onderhandeling was zonder "
+"succes.\n"
+"U kunt TLS uitschakelen in de instellingendialoog van het SMTP-account."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Verbinding is mislukt"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Er deed zich een fout voor tijdens de authenticatie: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Geen authenticatiedetails aangeleverd."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Kies een andere authenticatiemethode."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Uw SMTP-server ondersteunt %1 niet."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Uw SMTP-server ondersteunt niet (niet gedefinieerde methode)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Uw SMTP-server ondersteunt geen authenticatie.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"De authenticatie is mislukt.\n"
+"Waarschijnlijk is het wachtwoord onjuist.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Er kon geen gegevens uit de toepassing worden gelezen."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"De berichtinhoud werd geweigerd.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"De server antwoordde:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "De server antwoordde: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Dit is een tijdelijk probleem. Probeer het later nog eens."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "De toepassing verzond een ongeldig verzoek."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Het adres van de afzender ontbreekt."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open is mislukt (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Uw server (%1) biedt geen ondersteuning voor het verzenden van 8-bit "
+"berichten.\n"
+"Gebruik base64 of quoted-printable codering."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Schrijven naar socket is mislukt."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Ongeldig SMTP-antwoord (%1) ontvangen."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"De server (%1) accepteerde deze verbinding niet.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Gebruikersnaam en wachtwoord voor uw SMTP-account:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"De server accepteerde het adres van de afzender niet.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"De server accepteerde het afzenderadres %1.\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"De berichtverzending is mislukt doordat de volgende geadresseerden werden "
+"geweigerd door de server:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"De poging om te beginnen met het verzenden van de berichtinhoud is mislukt.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr ""
+"Niet-afgehandelde foutconditie. U wordt vriendelijk verzocht zo mogelijk een "
+"bugrapport in te zenden."
diff -Nru kmailtransport-16.12.3/po/nl/libmailtransport5.po kmailtransport-17.04.3/po/nl/libmailtransport5.po
--- kmailtransport-16.12.3/po/nl/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/nl/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,820 @@
+# translation of libmailtransport.po to Dutch
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Bram Schoenmakers <bramschoenmakers@kde.nl>, 2007.
+# Rinse de Vries <rinsedevries@kde.nl>, 2007.
+# Antoon Tolboom <atolboo@casema.nl>, 2008.
+# Antoon Tolboom <atolboo@gmail.com>, 2008.
+# Freek de Kruijf <freekdekruijf@kde.nl>, 2009, 2010, 2012, 2013, 2014, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-03-15 15:15+0100\n"
+"Last-Translator: Freek de Kruijf <freekdekruijf@kde.nl>\n"
+"Language-Team: Dutch <kde-i18n-nl@kde.org>\n"
+"Language: nl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Unieke identifier"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Voor de gebruiker zichtbare transportnaam"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "De naam die wordt gebruikt wanneer er naar de server verwezen wordt."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Naamloos"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP-server"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi-hulpbron"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Transporttype"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Hostnaam van de server"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "De domeinnaam of het numerieke adres van de SMTP-server."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Poortnummer van de server"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"Het poortnummer waarmee verbonden wordt met de SMTP-server. Standaard is dit "
+"25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Gebruikersnaam voor inloggen"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "De gebruikersnaam die naar de server verstuurd wordt ter autorisatie."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Uit te voeren commando voordat e-mail wordt verzonden"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Een commando om lokaal uit te voeren voordat de e-mail wordt verzonden. Dit "
+"kan worden gebruikt om SSH-tunnels in te stellen. Laat het leeg als u geen "
+"commando wilt laten uitvoeren.        "
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Server vereist authenticatie"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Activeer deze optie als uw SMTP-server authenticatie vereist voor het "
+"accepteren van e-mail. Dit staat bekend als 'Authenticated SMTP' of "
+"eenvoudigweg ASMTP.        "
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Wachtwoord opslaan"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Activeer deze optie als u uw wachtwoord wilt laten opslaan.\n"
+"Als KWallet beschikbaar is zal het wachtwoord daarin worden opgeslagen. Dit "
+"wordt als veilig beschouwd.\n"
+"Echter, als KWallet niet beschikbaar is, zal het wachtwoord worden "
+"opgeslagen in het configuratiebestand. Het wachtwoord wordt dan versleuteld "
+"opgeslagen, maar dit kunt u niet als veilig beschouwen tegen pogingen tot "
+"ontcijferen door derden die toegang hebben gekregen tot het "
+"configuratiebestand."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Versleutelingmethode voor communicatie"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Geen versleuteling"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL-versleuteling"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS-versleuteling"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Authenticatiemethode"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TEDOEN -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Selecteer deze optie als u een aangepaste hostnaam wilt gebruiken voor "
+"identificatie bij de mailserver. Dit is bruikbaar als uw systeemhostnaam "
+"onjuist is ingesteld of om de werkelijke hostnaam van uw systeem te maskeren."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+"Voer de hostnaam in die u wilt gebruiken tijdens de identificatie bij de "
+"server."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Selecteer deze optie als u een aangepast afzenderadres wilt gebruiken voor "
+"identificatie bij de mailserver. Als dit niet is geselecteerd dan zal het "
+"adres uit de identiteit worden gebruikt."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Voer het adres in dat u wilt gebruiken om het standaard afzenderadres te "
+"overschrijven."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Precommando wordt uitgevoerd"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Precommando '%1' wordt uitgevoerd."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Kon het precommando '%1' niet uitvoeren."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Fout bij het uitvoeren van precommando '%1'."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Het precommando is onverwacht beëindigd."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Het precommando stopte met code %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"U dient een gebruikersnaam en wachtwoord op te geven voor deze SMTP-server."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Kon SMTP-taak niet aanmaken."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Leesbare tekst"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anoniem"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Onbekend"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet is niet beschikbaar. U wordt ten zeerste aangeraden om KWallet te "
+"gebruiken voor het beheren van uw wachtwoorden.\n"
+"Echter, het wachtwoord kan ook worden opgeslagen in het configuratiebestand "
+"van dit programma. Het wordt dan in een versleutelde opmaak opgeslagen, maar "
+"dit dient u niet te zien als beveiligd tegen ontcijferpogingen door derden "
+"die toegang hebben gekregen tot het configuratiebestand.\n"
+"Wilt u het wachtwoord voor server '%1' opslaan in het configuratiebestand?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet is niet beschikbaar"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Wachtwoord opslaan"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Wachtwoord niet opslaan"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Het uitgaande account \"%1\" is niet juist ingesteld."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Standaard Transport"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "U dient een uitgaand account in te stellen voor het verzenden."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Account nu aanmaken?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Account nu aanmaken"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Account instellen"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Een SMTP-server in het internet"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"De volgende e-mailtransporten hebben wachtwoorden opgeslagen in een niet-"
+"versleuteld configuratiebestand.\n"
+"Voor veiligheidsredenen is het aanbevolen om KWallet te gebruiken voor het "
+"opslaan van deze wachtwoorden, \n"
+"die gevoelige gegevens in een sterk versleuteld bestand opstaat.\n"
+"Wilt u uw wachtwoorden overplaatsen naar KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Vraag"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Overplaatsen"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Behouden"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Stap één: Transporttype selecteren"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Naam:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Dit het standaard uitgaande account maken."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Een accounttype uit de onderstaande lijst selecteren:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Type"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Beschrijving"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Algemeen"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Accountinformatie"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Uitgaande &mailserver:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Gebruikersnaam:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "&Wachtwoord:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Het wachtwoord dat voor authenticatie naar de server wordt verstuurd."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&SMTP-wachtwoord opslaan"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Server ver&eist authenticatie"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Geavanceerd"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Verbindingsinstellingen"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Autodetecteren"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Deze server biedt geen ondersteuning voor authenticatie"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Versleuteling:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "Gee&n"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Poort:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Authenticatie:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP-instellingen"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Aangepaste hostnaam naar server zen&den"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "Hostnaa&m:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Aangepast afzenderadres gebruiken"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Afzenderadres:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Precommando:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Verwijderen"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Als &standaard instellen"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "&Toevoegen..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "He&rnoemen"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Wijzigen..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Uitgaand account aanmaken"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Aanmaken en configureren"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Mogelijkheden controleren is mislukt. Controleer de poort en de "
+"authenticatiemethode."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Mogelijkheden controleren is mislukt"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Het uitgaande account kan niet worden ingesteld."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Naam"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Type"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Standaard)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Wilt u het uitgaande account '%1' verwijderen?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Uitgaand account verwijderen?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Toevoegen..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Wijzigen..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Hernoemen"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Verwijderen"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Als standaard instellen"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Leeg bericht."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Bericht heeft geen ontvangers."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Bericht heeft een ongeldig transportmedium."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Bericht heeft een ongeldige 'verzonden mail'-map."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Hos&tnaam:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Lokale sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Fout bij uitvoeren van mailerprogramma %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail stopte onverwacht."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail stopte onverwacht: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Een lokale sendmail-installatie"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Sendmail-locatie"
+
+#~ msgid "Mail &server:"
+#~ msgstr "Mail&server:"
+
+#~ msgid "Edit..."
+#~ msgstr "Bewerken..."
+
+#~ msgid "text"
+#~ msgstr "tekst"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "Ondersteuning &van de server controleren"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Authenticatiemethode"
+
+#~ msgid "&LOGIN"
+#~ msgstr "&LOGIN"
+
+#~ msgid "&PLAIN"
+#~ msgstr "&PLAIN"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "&GSSAPI"
+
+#~ msgid "&NTLM"
+#~ msgstr "&NTLM"
+
+#~ msgid "Transport: Sendmail"
+#~ msgstr "Transport: Sendmail"
+
+#~ msgid "&Location:"
+#~ msgstr "&Locatie:"
+
+#~ msgid "Choos&e..."
+#~ msgstr "Ki&ezen..."
+
+#~ msgid "Transport: SMTP"
+#~ msgstr "Transport: SMTP"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "Use Sendmail"
+#~ msgstr "Sendmail gebruiken"
+
+#~ msgid "Only local files allowed."
+#~ msgstr "Uitsluitend lokale bestanden zijn toegestaan."
+
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "Transport toevoegen"
+
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "Transport wijzigen"
diff -Nru kmailtransport-16.12.3/po/nn/kio_smtp.po kmailtransport-17.04.3/po/nn/kio_smtp.po
--- kmailtransport-16.12.3/po/nn/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/nn/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,233 @@
+# Translation of kio_smtp to Norwegian Nynorsk
+#
+# Gaute Hvoslef Kvalnes <gaute@verdsveven.com>, 2002, 2003, 2004, 2005.
+# Eirik U. Birkeland <eirbir@gmail.com>, 2008.
+# Karl Ove Hufthammer <karl@huftis.org>, 2008, 2010, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-01-31 14:55+0100\n"
+"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
+"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"Language: nn\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Environment: kde\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Tenaren avviste både EHLO og HELO som ukjende eller ikkje implementerte.\n"
+"Du bør kontakta systemadministratoren til tenaren."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Uventa svar frå tenaren på kommandoen %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"SMTP-tenaren støttar ikkje TLS. Slå av TLS dersom du vil kopla til utan "
+"kryptering."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"SMTP-tenaren hevdar at han støttar TLS, men forhandlinga mislukkast.\n"
+"Du kan slå av TLS i innstillingsvindauget for SMTP-kontoen."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Tilkoplinga mislukkast"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Det oppstod ein feil under autentiseringa: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Ingen autentiseringsdetaljar er lagde ved."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Vel ein annan autentiseringsmåte."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "SMTP-tenaren støttar ikkje %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "SMTP-tenaren støttar ikkje (uoppgjeven metode)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"SMTP-tenaren støttar ikkje autentisering.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Autentiseringa mislukkast.\n"
+"Passordet er sannsynlegvis feil.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Klarte ikkje lesa data frå programmet."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Meldingsinnhaldet vart ikkje godteke.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Tenaren svara:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Tenaren svara: «%1»"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Dette er ein mellombels feil. Du kan prøva på nytt litt seinare."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Programmet sende ein ugyldig førespurnad."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Avsendaradressa manglar."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open mislukkast (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Tenaren (%1) støttar ikkje sending av 8-bit-meldingar.\n"
+"Du kan bruka base64 eller quoted-printable i staden."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Klarte ikkje skriva til socket-en."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Ugyldig SMTP-svar (%1) motteke."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Tenaren (%1) godtok ikkje tilkoplinga.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Brukarnamn og passord for SMTP-kontoen:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Tenaren godtok ikkje avsendaradressa.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Tenaren godtok ikkje avsendaradressa «%1».\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Klarte ikkje senda meldinga fordi dei følgjande mottakarane vart avviste av "
+"tenaren:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Forsøket på å starta sendinga av meldingsinnhaldet mislukkast.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Denne feilen kan ikkje handterast. Du bør senda inn ein feilrapport."
diff -Nru kmailtransport-16.12.3/po/nn/libmailtransport5.po kmailtransport-17.04.3/po/nn/libmailtransport5.po
--- kmailtransport-16.12.3/po/nn/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/nn/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,708 @@
+# Translation of libmailtransport5 to Norwegian Nynorsk
+#
+# Karl Ove Hufthammer <karl@huftis.org>, 2008, 2010, 2011.
+# Eirik U. Birkeland <eirbir@gmail.com>, 2009, 2010.
+# Olav Selseng Vestreim <o.vest@operamail.com>, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2015-04-16 14:45+0200\n"
+"Last-Translator: Olav Selseng Vestreim <o.vest@operamail.com>\n"
+"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"Language: nn\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Environment: kde\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Unik ID"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Brukarsynleg transportnamn"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Namnet som vert brukt når det vert referert til denne tenaren."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr ""
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP-tenar"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi-ressurs"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Transporttype"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Vertsnamnet til tenaren"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Domenenamnet eller den numeriske adressa til SMTP-tenaren."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Portnummeret til tenaren"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "Portnummeret som SMTP-tenaren lyttar på. Standardporten er 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Brukarnamn til innlogging"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Brukarnamnet som skal sendast til tenaren ved innlogging."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Kommando som skal køyrast før ein e-post vert send"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Tenaren krev innlogging"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Lagra passord"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Krypteringsmetode som vert brukt til kommunikasjon"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Inga kryptering"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL-kryptering"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS-kryptering"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Autentiseringsmetode"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- HUGS -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Kryss av her for å bruka eit sjølvvalt vertsnamn når du loggar inn på e-"
+"posttenaren. Dette er nyttig når vertsnamnet på systemet ikkje er rett, "
+"eller for å dekkja over det verkelege vertsnamnet."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Skriv inn vertsnamnet som skal brukast ved innlogging på tenaren."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Køyrer førkommando"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Køyrer førkommandoen «%1»."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Klarte ikkje køyra førkommandoen «%1»."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Feil ved køyring av førkommandoen «%1»."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Førkommandoen krasja."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Førkommandoen vart avslutta med kode %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Du må oppgje eit brukarnamn og eit passord for å bruka denne SMTP-tenaren."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Klarte ikkje oppretta SMTP-jobb."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1, nr. %2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr ""
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr ""
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Ukjend"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KDE Lommebokpassar er ikkje tilgjengeleg. Det er sterkt tilrådd at du brukar "
+"dette programmet til å handsama passord.\n"
+"Passordet kan likevel lagrast i oppsettsfila. Det vert lagra i eit "
+"uforståeleg format, men bør ikkje reknast som sikkert dersom nokon får "
+"tilgang til oppsettsfila.\n"
+"Vil du lagra passordet til tenaren «%1» i oppsettsfila?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KDE Lommebokpassar er ikkje tilgjengeleg"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Lagra passord"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Ikkje lagra passord"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Standard overføringsmetode"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Du må leggja til ein konto for utgåande e-post først."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Vil du leggja til kontoen no?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Legg til kontoen"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Set opp konto"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Ein SMTP-tenar på Internett"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Dei følgjande overføringsmetodane lagrar passorda i ei ukryptert "
+"oppsettsfil.\n"
+"Av tryggleiksårsaker bør du vurdera å flytta dei over til passordhandsamaren "
+"KDE Lommebokpassar.\n"
+"Der vert dei lagra i ei sterkt kryptert fil.\n"
+"Vil du flytta over passorda til KDE Lommebokpassar?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Spørsmål"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Flytt over"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Ta vare på"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Steg 1: Vel transporttype"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Namn:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Gjer denne til standard konto for utgåande e-post."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Vel kontotype frå lista nedanfor:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Type"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Skildring"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Generelt"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Kontoinformasjon"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Brukarnamn:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "P&assord:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Brukarnamnet som skal sendast til tenaren ved innlogging."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "Lag&ra SMTP-passord"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Tenaren &krev autentisering"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Avansert"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Innstillingar for tilkopling"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Autooppdaging"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Denne tenaren støttar ikkje autentisering"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Kryptering:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Inga"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Autentisering:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP-val"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Sen&d anna vertsnamn til tenaren"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Førkommando:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Fjern"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "&Bruk som standard"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "&Legg til …"
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Endra namn"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Endra …"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Lag ny utgåande konto"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Lag og set opp"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Kunne ikkje sjekka for funksjonar. Sjå over dine autentiserings og "
+"portinnstillingane."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Kunne ikkje sjekka funksjonar"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr ""
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Namn"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Type"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (standard)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Legg til …"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Endra …"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Endra namn"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Fjern"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Bruk som standard"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Tom melding."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Meldinga manglar mottakar."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Meldinga har ein ugyldig transport."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Meldinga har ei ugyldig «sende meldingar»-mappe."
diff -Nru kmailtransport-16.12.3/po/pa/kio_smtp.po kmailtransport-17.04.3/po/pa/kio_smtp.po
--- kmailtransport-16.12.3/po/pa/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/pa/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,240 @@
+# translation of kio_smtp.po to Punjabi
+# Amanpreet Singh Alam <aalam@redhat.com>, 2004, 2005.
+# Amanpreet Singh Brar <aalam@redhat.com>, 2005.
+# Amanpreet Singh Alam <amanpreetalam@yahoo.com>, 2005.
+# AP S Alam <aalam@users.sf.net>, 2007.
+# A S Alam <aalam@users.sf.net>, 2007, 2009, 2010.
+# ASB <aalam@users.sf.net>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-02-01 08:17+0530\n"
+"Last-Translator: A S Alam <aalam@users.sf.net>\n"
+"Language-Team: ਪੰਜਾਬੀ <punjabi-users@lists.sf.net>\n"
+"Language: pa\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"\n"
+"\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"ਸਰਵਰ ਨੇ ਦੋਵੇਂ EHLO ਅਤੇ HELO ਕਮਾਂਡਾਂ ਨੂੰ ਪਛਾਣ ਜਾਂ ਵਰਤਣ ਤੋਂ ਨਾਂਹ ਕਰ ਦਿੱਤੀ ਹੈ।\n"
+"ਸਰਵਰ ਦੇ ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਕ ਨਾਲ ਸੰਪਰਕ ਕਰੋ ਜੀ।"
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"ਕਮਾਂਡ %1 ਲਈ ਸਰਵਰ ਦਾ ਅਸਪਸ਼ਟ ਜਵਾਬ ਆਇਆ ਹੈ।\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"ਤੁਹਾਡਾ SMTP ਸਰਵਰ TLS ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ, ਜੇਕਰ ਤੁਸੀਂ ਬਿਨਾਂ ਇੰਕ੍ਰਿਪਸ਼ਨ ਤੋਂ ਜੁੜਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ "
+"TLS ਨੂੰ ਅਯੋਗ ਕਰੋ।"
+
+#: command.cpp:197
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your SMTP server claims to support TLS, but negotiation was "
+#| "unsuccessful.\n"
+#| "You can disable TLS in KDE using the crypto settings module."
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"ਤੁਹਾਡਾ SMTP ਸਰਵਰ TLS ਲਈ ਸਹਾਇਕ ਹੋਣ ਦਾ ਦਾਅਵਾ ਤਾਂ ਕਰਦਾ ਹੈ, ਪਰ ਸੰਚਾਰ ਯਤਨ ਅਸਫਲ ਰਹੇ ਹਨ।\n"
+"ਤੁਸੀਂ KDE ਵਿੱਚ crypto ਸੈਟਿੰਗ ਮੋਡੀਉਲ ਵਿੱਚ TLS ਨੂੰ ਅਯੋਗ ਕਰ ਸਕਦੇ ਹੋ।"
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ ਹੈ"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "ਪਰਮਾਣਿਤ ਕਰਨ ਦੌਰਾਨ ਇੱਕ ਗਲਤੀ ਆਈ ਹੈ: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "ਕੋਈ ਸਹਾਇਕ ਪਰਮਾਣਕਤਾ ਵੇਰਵਾ ਨਹੀਂ ਲੱਭਾ ਹੈ।"
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "ਇੱਕ ਵੱਖਰਾ ਪਰਮਾਣਕਤਾ ਢੰਗ ਵਰਤੋਂ ਜੀ।"
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "ਤੁਹਾਡਾ SMTP ਪਰਮਾਣਕਿਤਾ ਲਈ %1 ਸਹਾਇਕ ਨਹੀਂ ਹੈ।"
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "ਤੁਹਾਡਾ SMTP ਪਰਮਾਣਕਿਤਾ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ (ਅਣ-ਦੱਸਿਆ ਢੰਗ)।"
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"ਤੁਹਾਡਾ SMTP ਪਰਮਾਣਕਿਤਾ ਲਈ ਸਹਾਇਕ ਨਹੀਂ ਹੈ।\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"ਪਰਮਾਣਕਿਤਾ ਅਸਫ਼ਲ ਹੈ।\n"
+"ਸ਼ਾਇਦ ਪਾਸਵਰਡ ਗਲਤ ਹੈ।\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "ਐਪਲੀਕੇਸ਼ਨ ਲਈ ਡਾਟਾ ਪੜ੍ਹਨ ਵਿੱਚ ਅਸਫ਼ਲ ਹੈ।"
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"ਸੁਨੇਹਾ ਭਾਗਾਂ ਨੂੰ ਸਵੀਕਾਰ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ ਹੈ\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"ਸਰਵਰ ਦਾ ਜਵਾਬ:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "ਸਰਵਰ ਜਵਾਬ: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "ਇਹ ਆਰਜ਼ੀ ਅਸਫਲਤਾ ਹੈ, ਤੁਸੀਂ ਬਾਅਦ ਵਿੱਚ ਕੋਸ਼ਿਸ ਕਰ ਸਕਦੇ ਹੋ।"
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "ਐਪਲੀਕੇਸ਼ਨ ਨੇ ਇੱਕ ਗਲਤ ਬੇਨਤੀ ਭੇਜੀ।"
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "ਭੇਜਣ ਵਾਲੇ ਦਾ ਐਡਰੈੱਸ ਨਹੀਂ ਹੈ।"
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open ਅਸਫ਼ਲ (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"ਤੁਹਾਡਾ ਸਰਵਰ (%1) 8-ਬਿੱਟ ਸੁਨੇਹਿਆਂ ਲਈ ਸਹਾਈ ਨਹੀਂ ਹੈ\n"
+"base64 ਜਾਂ quoted-printable ਇੰਕੋਡਿੰਗ ਵਰਤੋਂ।"
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "ਸਾਕਟ ਲਈ ਲਿਖਣ ਲਈ ਫੇਲ੍ਹ।"
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "ਗਲਤ SMTP ਜਵਾਬ (%1) ਪ੍ਰਾਪਤ ਹੋਇਆ ਹੈ।"
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"ਸਰਵਰ (%1)  ਨੇ ਕੁਨੈਕਸ਼ਨ ਸਵੀਕਾਰ ਨਹੀਂ ਕੀਤਾ ਹੈ\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "ਤੁਹਾਡੇ SMTP ਅਕਾਊਂਟ ਲਈ ਯੂਜ਼ਰ ਨਾਂ ਅਤੇ ਪਾਸਵਰਡ:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"ਸਰਵਰ ਭੇਜਣ ਵਾਲੇ ਦਾ ਐਡਰੈੱਸ ਖਾਲੀ ਮਨਜ਼ੂਰ ਨਹੀਂ ਕਰਦਾ ਹੈ।\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"ਸਰਵਰ ਭੇਜਣ ਵਾਲੇ ਦਾ ਐਡਰੈੱਸ \"%1\" ਮਨਜ਼ੂਰ ਨਹੀਂ ਕਰਦਾ ਹੈ।\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"ਸੁਨੇਹਾ ਭੇਜਣ ਵਿੱਚ ਅਸਫਲ, ਕਿਉਕਿ ਸਰਵਰ ਨੇ ਇਸ ਪਰਾਪਤ-ਕਰਤਾ ਨੂੰ ਮਨਜ਼ੂਰ ਨਹੀਂ ਕੀਤਾ ਹੈ:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"ਸੁਨੇਹਾ ਭਾਗ ਭੇਜਣ ਦੀ ਕੋਸ਼ਿਸ ਵਿੱਚ ਗਲਤੀ ਆਈ ਹੈ\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "ਨਾ-ਸਪਸ਼ਟ ਗਲਤੀ ਹਾਲਤ। ਇੱਕ ਬੱਗ ਜਾਣਕਾਰੀ ਭੇਜੋ ਜੀ।"
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "kio_smtp ਵਿੱਚ ਕੋਈ ਪਰਮਾਣਕਤਾ ਸਹਿਯੋਗ ਸ਼ਾਮਿਲ ਨਹੀਂ ਹੈ।"
diff -Nru kmailtransport-16.12.3/po/pa/libmailtransport5.po kmailtransport-17.04.3/po/pa/libmailtransport5.po
--- kmailtransport-16.12.3/po/pa/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/pa/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,787 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Amanpreet Singh Alam <aalam@users.sf.net>, 2008.
+# A S Alam <aalam@users.sf.net>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-02-01 08:19+0530\n"
+"Last-Translator: A S Alam <aalam@users.sf.net>\n"
+"Language-Team: ਪੰਜਾਬੀ <punjabi-users@lists.sf.net>\n"
+"Language: pa\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "ਵਿਲੱਖਣ ਪਛਾਣਕਰਤਾ"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "ਯੂਜ਼ਰ ਵੇਖਣਯੋਗ ਟਰਾਂਸਪੋਰਟ ਨਾਂ"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "ਨਾਂ, ਜੋ ਕਿ ਇਸ ਸਰਵਰ ਬਾਰੇ ਜਾਣਕਾਰੀ ਦੇਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇਗਾ।"
+
+#: kmailtransport/mailtransport.kcfg:18
+#, fuzzy, kde-format
+#| msgid "&Rename"
+msgid "Unnamed"
+msgstr "ਨਾਂ ਬਦਲੋ(&R)"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP ਸਰਵਰ"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "ਅਕੌਂਡੀ ਸਰੋਤ"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "ਟਰਾਂਸਪੋਰਟ ਟਾਈਪ"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "ਸਰਵਰ ਦਾ ਹੋਸਟ ਨਾਂ"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "SMTP ਸਰਵਰ ਦਾ ਡੋਮੇਨ ਨਾਂ ਜਾਂ ਗਿਣਤੀ ਐਡਰੈੱਸ"
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "ਸਰਵਰ ਦੀ ਪੋਰਟ ਨੰਬਰ"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "ਪੋਰਟ ਨੰਬਰ, ਜਿੱਥੇ ਕਿ SMTP ਸਰਵਰ ਲਿਸਨ ਕਰਦਾ ਹੈ। ਡਿਫਾਲਟ ਪੋਰਟ 25 ਹੈ।"
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "ਯੂਜ਼ਰ ਨਾਂ ਲਾਗਇਨ ਲਈ ਚਾਹੀਦਾ ਹੈ"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "ਸਰਵਰ ਲਈ ਪਰਮਾਣਕਿਤਾ ਵਾਸਤੇ ਭੇਜਣ ਲਈ ਯੂਜ਼ਰ ਨਾਂ।"
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "ਇੱਕ ਮੇਲ ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ ਚਲਾਉਣ ਲਈ ਕਮਾਂਡ"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "ਸਰਵਰ ਲਈ ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "ਪਾਸਵਰਡ ਸੰਭਾਲੋ"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "ਸੰਚਾਰ ਲਈ ਇੰਕ੍ਰਿਪਸ਼ਨ ਢੰਗ"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "ਕੋਈ ਇੰਕ੍ਰਿਪਸ਼ਨ ਨਹੀਂ"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL ਇੰਕ੍ਰਿਪਸ਼ਨ"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS ਇੰਕ੍ਰਿਪਸ਼ਨ"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "ਪਰਾਮਣਕਿਤਾ ਢੰਗ"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, fuzzy, kde-format
+#| msgid "The name that will be used when referring to this server."
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "ਨਾਂ, ਜੋ ਕਿ ਇਸ ਸਰਵਰ ਬਾਰੇ ਜਾਣਕਾਰੀ ਦੇਣ ਲਈ ਵਰਤਿਆ ਜਾਵੇਗਾ।"
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "ਪ੍ਰੀ-ਕਮਾਂਡ ਚਲਾਈ ਜਾ ਰਹੀ ਹੈ"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "ਪ੍ਰੀ-ਕਮਾਂਡ '%1' ਚਲਾਈ ਜਾ ਰਹੀ ਹੈ"
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "ਪ੍ਰੀ-ਕਮਾਂਡ '%1' ਸ਼ੁਰੂ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ।"
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "ਪ੍ਰੀ-ਕਮਾਂਡ '%1' ਚਲਾਉਣ ਦੌਰਾਨ ਗਲਤੀ।"
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "ਪ੍ਰੀ-ਕਮਾਂਡ ਕਰੈਸ਼ ਹੋਈ।"
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "ਪ੍ਰੀ-ਕਮਾਂਡ ਕੋਡ %1 ਨਾਲ ਬੰਦ ਹੋਈ।"
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr "ਤੁਹਾਨੂੰ ਇਸ SMTP ਸਰਵਰ ਲਈ ਇੱਕ ਯੂਜ਼ਰ ਨਾਂ ਅਤੇ ਪਾਸਵਰਡ ਦੇਣ ਦੀ ਲੋੜ ਹੈ।"
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "SMTP ਜਾਬ ਬਣਾਉਣ ਲਈ ਅਸਮਰੱਥ।"
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr ""
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr ""
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "ਅਣਜਾਣ"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "ਕੇ-ਵਾਲਿਟ ਉਪਲੱਬਧ ਨਹੀਂ"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "ਪਾਸਵਰਡ ਸੰਭਾਲੋ"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "ਪਾਸਵਰਡ ਨਾ ਸੰਭਾਲੋ"
+
+#: kmailtransport/transportjob.cpp:131
+#, fuzzy, kde-format
+#| msgid "The mail transport \"%1\" is not correctly configured."
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "ਮੇਲ ਟਰਾਂਸਪੋਰਟ \"%1\" ਠੀਕ ਤਰ੍ਹਾਂ ਸੰਰਚਿਤ ਨਹੀਂ ਹੈ।"
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "ਡਿਫਾਲਟ ਟਰਾਂਸਪੋਰਟ"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "ਤੁਹਾਨੂੰ ਭੇਜਣ ਤੋਂ ਪਹਿਲਾਂ ਭੇਜਣ (outgoing) ਅਕਾਊਂਟ ਬਣਾਉਣਾ ਪਵੇਗਾ।"
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "ਅਕਾਊਂਟ ਹੁਣੇ ਬਣਾਉਣਾ ਹੈ?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "ਹੁਣੇ ਅਕਾਊਂਟ ਬਣਾਓ"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "ਅਕਾਊਂਟ ਸੰਰਚਨਾ"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "ਇੰਟਰਨੈੱਟ ਉੱਤੇ SMTP ਸਰਵਰ"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "ਸਵਾਲ"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "ਮਾਈਗਰੇਟ"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "ਰੱਖੋ"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "ਨਾਂ:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "ਇਹ ਡਿਫਾਲਟ ਭੇਜਣ ਅਕਾਊਂਟ ਬਣਾਉ।"
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "ਹੇਠਾਂ ਲਿਸਟ ਤੋਂ ਅਕਾਊਂਟ ਕਿਸਮ ਚੁਣੋ:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "ਟਾਈਪ"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "ਵੇਰਵਾ"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "ਆਮ"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, fuzzy, kde-format
+#| msgid "Outgoing mail &server:"
+msgid "Outgoing &mail server:"
+msgstr "ਬਾਹਰੀ ਭੇਜਣ ਮੇਲ ਸਰਵਰ(&s):"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "ਲਾਗਇਨ(&L):"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "ਪਾਸਵਰਡ(&a):"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "ਸਰਵਰ ਨੂੰ ਪਰਮਾਣਕਿਤਾ ਭੇਜਣ ਲਈ ਪਾਸਵਰਡ"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&SMTP ਪਾਸਵਰਡ ਸੰਭਾਲੋ"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "ਸਰਵਰ ਲਈ ਪਰਮਾਣਕਿਤਾ ਦੀ ਲੋੜ ਹੈ(&r)"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "ਤਕਨੀਕੀ"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "ਇਹ ਸਰਵਰ ਪਰਮਾਣਕਿਤਾ ਲਈ ਸਹਿਯੋਗੀ ਨਹੀਂ"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, fuzzy, kde-format
+#| msgid "Encryption"
+msgid "Encryption:"
+msgstr "ਇਕ੍ਰਿਪਸ਼ਨ"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "ਕੋਈ ਨਹੀਂ(&N)"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "ਪੋਰਟ(&P):"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, fuzzy, kde-format
+#| msgid "Authentication method"
+msgid "Authentication:"
+msgstr "ਪਰਾਮਣਕਿਤਾ ਢੰਗ"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "ਸਰਵਰ ਨੂੰ ਪਸੰਦੀਦਾ ਹੋਸਟ-ਨਾਂ ਭੇਜੋ(&d)"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, fuzzy, kde-format
+#| msgid "&Host:"
+msgid "Hostna&me:"
+msgstr "ਹੋਸਟ(&H):"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "ਪ੍ਰੀ-ਕਮਾਂਡ:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "ਹਟਾਓ(&v)"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "ਡਿਫਾਲਟ ਸੈੱਟ ਕਰੋ(&S)"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "ਸ਼ਾਮਲ(&A)..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "ਨਾਂ ਬਦਲੋ(&R)"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "ਸੋਧ(&M)..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "ਬਾਹਰ ਭੇਜਣ ਅਕਾਊਂਟ ਬਣਾਓ"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "ਬਣਾਏ ਅਤੇ ਸੰਰਚਨਾ"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, fuzzy, kde-format
+#| msgid "This transport cannot be configured."
+msgid "This outgoing account cannot be configured."
+msgstr "ਇਹ ਟਰਾਂਸਪੋਰਟ ਸੰਰਚਿਤ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ।"
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "ਨਾਂ"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "ਟਾਈਪ"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (ਡਿਫਾਲਟ)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, fuzzy, kde-format
+#| msgid "Create Outgoing Account"
+msgid "Remove outgoing account?"
+msgstr "ਬਾਹਰ ਭੇਜਣ ਅਕਾਊਂਟ ਬਣਾਓ"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, fuzzy, kde-format
+#| msgid "A&dd..."
+msgid "Add..."
+msgstr "ਸ਼ਾਮਲ(&A)..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, fuzzy, kde-format
+#| msgid "&Modify..."
+msgid "Modify..."
+msgstr "ਸੋਧ(&M)..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, fuzzy, kde-format
+#| msgid "&Rename"
+msgid "Rename"
+msgstr "ਨਾਂ ਬਦਲੋ(&R)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, fuzzy, kde-format
+#| msgid "Remo&ve"
+msgid "Remove"
+msgstr "ਹਟਾਓ(&v)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, fuzzy, kde-format
+#| msgid "&Set as Default"
+msgid "Set as Default"
+msgstr "ਡਿਫਾਲਟ ਸੈੱਟ ਕਰੋ(&S)"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "ਖਾਲੀ ਸੁਨੇਹਾ।"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "ਸੁਨੇਹੇ ਵਿੱਚ ਕੋਈ ਪ੍ਰਾਪਤਕਰਤਾ ਨਹੀਂ।"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr ""
+
+#~ msgid "Hos&tname:"
+#~ msgstr "ਹੋਸਟ-ਨਾਂ(&t):"
+
+#~ msgid "Local sendmail"
+#~ msgstr "ਲੋਕਲ sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "ਮੇਲਰ ਪਰੋਗਰਾਮ %1 ਚਲਾਉਣ ਲਈ ਫੇਲ੍ਹ"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "sendmail ਗਲਤ ਢੰਗ ਨਾਲ ਖਤਮ ਹੋਈ।"
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail ਅਚਾਨਕ ਬੰਦ ਹੋਈ: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "ਲੋਕਲ sendmail ਇੰਸਟਾਲੇਸ਼ਨ"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Sendmail ਟਿਕਾਣਾ(&L):"
+
+#, fuzzy
+#~| msgid "Outgoing mail &server:"
+#~ msgid "Mail &server:"
+#~ msgstr "ਬਾਹਰੀ ਭੇਜਣ ਮੇਲ ਸਰਵਰ(&s):"
+
+#~ msgid "text"
+#~ msgstr "ਟੈਕਸਟ"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "ਚੈੱਕ ਕਰੋ ਕਿ ਸਰਵਰ ਕਿਸ ਲਈ ਸਹਾਇਕ ਹੈ(&W)"
+
+#~ msgid "Authentication Method"
+#~ msgstr "ਪਰਮਾਣਕਿਤਾ ਢੰਗ"
+
+#~ msgid "&LOGIN"
+#~ msgstr "&LOGIN"
+
+#~ msgid "&PLAIN"
+#~ msgstr "&PLAIN"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "&GSSAPI"
+
+#~ msgid "&NTLM"
+#~ msgstr "&NTLM"
+
+#~ msgid "Transport: Sendmail"
+#~ msgstr "ਟਰਾਂਸਪੋਰਟ: Sendmail"
+
+#~ msgid "&Location:"
+#~ msgstr "ਟਿਕਾਣਾ(&L):"
+
+#~ msgid "Choos&e..."
+#~ msgstr "ਚੁਨੋ(&e)..."
+
+#~ msgid "Transport: SMTP"
+#~ msgstr "ਟਰਾਂਸਪੋਰਟ: SMTP"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "Use Sendmail"
+#~ msgstr "Sendmail ਵਰਤੋਂ"
+
+#~ msgid "Only local files allowed."
+#~ msgstr "ਕੇਵਲ ਲੋਕਲ ਫਾਇਲਾਂ ਮਨਜ਼ੂਰ ਹਨ।"
+
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "ਟਰਾਂਸਪੋਰਟ ਸ਼ਾਮਲ"
+
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "ਟਰਾਂਸਪੋਰਟ ਸੋਧ"
diff -Nru kmailtransport-16.12.3/po/pl/kio_smtp.po kmailtransport-17.04.3/po/pl/kio_smtp.po
--- kmailtransport-16.12.3/po/pl/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/pl/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,243 @@
+# translation of kio_smtp.po to
+# Version: $Revision: 1486852 $
+# Copyright (C) 2002, 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#
+# Michał Rudolf <mrudolf@kdewebdev.org>, 2002.
+# Marcin Giedz <mgiedz@elka.pw.edu.pl>, 2002.
+# Mikolaj Machowski <mikmach@wp.pl>, 2004, 2005.
+# Krzysztof Lichota <lichota@mimuw.edu.pl>, 2005.
+# Marta Rybczyńska <kde-i18n@rybczynska.net>, 2007, 2008.
+# Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>, 2011, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2015-11-28 10:41+0100\n"
+"Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
+"Language-Team: Polish <kde-i18n-doc@kde.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Serwer odrzucił zarówno komendę EHLO, jak i HELO jako nieznaną lub "
+"niezaimplementowaną.\n"
+"Proszę skontaktować się z administratorem serwera."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Niespodziewana odpowiedź serwera na komendę %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Twój serwer SMTP nie obsługuje TLS. Wyłącz TLS, jeśli chcesz połączyć się "
+"bez zabezpieczenia."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Twój serwer SMTP twierdzi, że obsługuje TLS, ale negocjacja zakończyła się "
+"niepomyślnie.\n"
+"Możesz wyłączyć TLS w oknie dialogowym ustawień konta SMTP."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Połączenie nie powiodło się"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Podczas uwierzytelniania wystąpił błąd: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Nie podano szczegółów do uwierzytelniania."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Wybierz inną formę uwierzytelniania."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Twój serwer SMTP nie obsługuje %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Twój serwer SMTP nie obsługuje (nieznana metoda)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Twój serwer SMTP nie obsługuje uwierzytelniania.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Błąd uwierzytelniania.\n"
+"Najprawdopodobniej hasło jest nieprawidłowe.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Nie można odczytać danych z programu."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Zawartość wiadomości nie została zaakceptowana.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Serwer odpowiedział:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Serwer odpowiedział: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "To jest tymczasowy błąd. Możesz spróbować ponownie później."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Program wysłał nieprawidłowe żądanie."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Adres nadawcy nie został podany."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "Protokół SMTP::smtp_open nie powiódł się (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Twój serwer (%1) nie obsługuje wysyłania 8-bitowych wiadomości.\n"
+"Proszę użyć kodowania base64 lub quoted-printable."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Nieudany zapis do gniazda."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Otrzymano niepoprawną odpowiedź SMTP (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Serwer (%1) nie zaakceptował połączenia.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Nazwa użytkownika i hasło dla konta SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Serwer nie zaakceptował pustego adresu nadawcy.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Serwer nie zaakceptował adresu nadawcy \"%1\".\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Wysyłanie wiadomości nie powiodło się, ponieważ następujący odbiorcy zostali "
+"odrzuceni przez serwer:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Nie powiodła się próba rozpoczęcia wysyłania zawartości wiadomości.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Nieobsługiwany błąd. Proszę wysłać zgłoszenie błędu w programie."
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr ""
+#~ "Obsługa uwierzytelniania nie została wkompilowana we wtyczkę protokołu "
+#~ "kio_smtp."
diff -Nru kmailtransport-16.12.3/po/pl/libmailtransport5.po kmailtransport-17.04.3/po/pl/libmailtransport5.po
--- kmailtransport-16.12.3/po/pl/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/pl/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,749 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>, 2014, 2015, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-12-04 09:44+0100\n"
+"Last-Translator: Łukasz Wojniłowicz <lukasz.wojnilowicz@gmail.com>\n"
+"Language-Team: Polish <kde-i18n-doc@kde.org>\n"
+"Language: pl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Lokalize 2.0\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Niepowtarzalny identyfikator"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Widoczna przez użytkownika nazwa rodzaju serwera pocztowego"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Nazwa używana w stosunku do tego serwera."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Nienazwany"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "Serwer SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Zasób Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Rodzaj serwera pocztowego"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Nazwa serwera"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Nazwa domenowa lub numeryczna (IP) serwera SMTP."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Numer portu na serwerze"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"Numer portu, na którym nasłuchuje serwer SMTP. Domyślnym numerem portu jest "
+"25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Nazwa użytkownika"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Nazwa użytkownika wysyłana na serwer w celu uwierzytelnienia."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Polecenie do wykonania przed wysłaniem poczty."
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Polecenie uruchamiane lokalnie, przed wysłaniem poczty. Może to być użyte na "
+"przykład do ustawienia tuneli SSH. Pozostaw puste, jeśli nie ma być "
+"uruchamiane żadne polecenie."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Serwer wymaga uwierzytelnienia"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Odhacz tą opcję, jeśli twój serwer SMTP wymaga uwierzytelnienia przez  "
+"zaakceptowaniem poczty. Jest to znane pod nazwą 'Uwierzytelniony SMTP' lup "
+"krócej ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Zapamiętaj hasło"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Zaznacz tę opcję, aby przechowywać swoje hasło.\n"
+"Jeżeli KPortfel jest dostępny, to hasło będzie tam przechowywane, co jest "
+"uznawane za bezpieczne.\n"
+"Jednakże, gdy KPortfel jest niedostępny, hasło będzie przechowywane w pliku "
+"ustawień. Hasło zostaje przechowywane w przestarzałym formacie, ale nie "
+"powinno być uznawane za bezpieczne, gdy zostanie uzyskany dostęp do pliku "
+"ustawień."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Metoda szyfrowania używana podczas komunikacji"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Brak szyfrowania"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "Szyfrowanie SSL"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "Szyfrowanie TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Metoda uwierzytelniania"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- Do zrobienia -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Zaznacz tę opcję, jeśli chcesz używać własnej nazwy komputera podczas "
+"wysyłania swojej identyfikacji serwerowi. Jest to użyteczne,  jeśli nazwa "
+"twojego komputera nie jest ustawiona poprawnie albo jeśli chcesz ukryć "
+"prawdziwą nazwę."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Podaj nazwę komputera, która ma być wysyłana do serwera."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Zaznacz tę opcję, aby użyć własnego adresu nadawcy dla serwera pocztowego. "
+"Jeśli niezaznaczone, to zostanie użyty adres z tożsamości."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr "Podaj adres używany do zastąpienia domyślnego adresu nadawcy."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Wykonywanie wstępnego polecenia"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Wykonywanie wstępnego polecenia '%1'."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Nie można wykonać wstępnego polecenia '%1'."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Błąd podczas wykonywania wstępnego polecenia '%1'."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Wykonywanie wstępnego polecenia zakończyło się z błędem."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Wykonywanie wstępnego polecenia zakończyło się z kodem %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr "Ten serwer SMTP wymaga nazwy użytkownika i hasła."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Nie udało się utworzyć zadania SMTP."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Zwykły tekst"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anonimowy"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Nieznany"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KPortfel nie jest dostępny. Wykorzystanie go do zarządzania hasłami jest "
+"zalecane.\n"
+"Zamiast tego hasła mogą być jednak przechowywane w pliku ustawień. Hasło "
+"jest tam zapisane w zaciemnionej formie, ale nie powinno być uważane za "
+"bezpieczne, jeśli inni mieli dostęp do tego pliku.\n"
+"Czy chcesz przechowywać hasło do serwera '%1' w pliku ustawień?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KPortfel niedostępny"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Przechowuj hasło"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Nie przechowuj hasła"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Konto wychodzące \"%1\" nie jest poprawnie ustawione."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Domyślny rodzaj serwera pocztowego"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Musisz utworzyć konto poczty wychodzącej przed wysłaniem."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Utworzyć konto teraz?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Utwórz konto teraz"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Ustaw konto"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Serwer SMTP w Internecie"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Następujące serwery pocztowe przechowują hasła w niezaszyfrowanym pliku "
+"ustawień.\n"
+"Z powodów bezpieczeństwa zaleca się przeniesienie tych haseł do KPortfela,\n"
+"który przechowuje wrażliwe dane w silnie zaszyfrowanym pliku.\n"
+"Czy chcesz przenieść swoje hasła do KPortfela?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Pytanie"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Przenieś"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Zachowaj"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Krok pierwszy: Wybierz rodzaj serwera pocztowego"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Nazwa:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Uczyń to konto domyślnym kontem wychodzącym."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Wybierz rodzaj konta z poniższego wykazu:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Rodzaj"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Opis"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Ogólne"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Szczegóły o koncie"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "&Serwer poczty wychodzącej:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Nazwa użytkownika:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "H&asło:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Hasło wysyłane do serwera w celu uwierzytelnienia."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "Przechowuj ha&sło SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Serwer wymaga uwie&rzytelnienia"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Zaawansowane"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Ustawienia połączenia"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Wykryj samoczynnie"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Ten serwer nie obsługuje uwierzytelniania"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Szyfrowanie:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Brak"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Uwierzytelnianie:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Ustawienia SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Wyśli&j własną nazwę komputera"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "&Nazwa gospodarza:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Użyj własnego adresu nadawcy"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Adres nadawcy:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Wstępne polecenie:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Usuń"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "&Ustaw jako domyślne"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "Do&daj..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Zmień nazwę"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "Z&mień..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Utwórz konto poczty wychodzącej"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Utwórz i ustaw"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Niepowodzenie przy sprawdzaniu możliwości. Proszę sprawdzić port i tryb "
+"uwierzytelniania."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Niepowodzenie przy sprawdzaniu możliwości"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "To konto wychodzące nie może zostać ustawione."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Nazwa"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Rodzaj"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Domyślne)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Czy chcesz usunąć konto wychodzące '%1'?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Czy usunąć konto wychodzące?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Dodaj..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Zmień..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Zmień nazwę"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Usuń"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Ustaw jako domyślne"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Pusta wiadomość."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Wiadomość nie ma odbiorców."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Wiadomość ma niepoprawny rodzaj serwera pocztowego."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Wiadomość ma niepoprawny katalog poczty wysłanej."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "&Nazwa komputera:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Lokalny sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Nie udało się uruchomić programu pocztowego %1."
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail zakończył pracę z błędem."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail zakończył pracę z błędem: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Lokalny sendmail"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Położenie Sendmai&la:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "&Serwer pocztowy:"
diff -Nru kmailtransport-16.12.3/po/pt/kio_smtp.po kmailtransport-17.04.3/po/pt/kio_smtp.po
--- kmailtransport-16.12.3/po/pt/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/pt/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,231 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-04-04 11:45+0000\n"
+"Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n"
+"Language-Team: Portuguese <kde-i18n-pt@kde.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-POFile-SpellExtra: EHLO quoted printable STMP smtpopen SMTPProtocol HELO\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"O servidor rejeitou ambos os comandos EHLO e HELO como desconhecidos ou "
+"implementados.\n"
+"Por favor contacte o administrador de sistemas do servidor."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Resposta inesperada do servidor ao comando %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"O seu servidor de SMTP não suporta o TLS. Desactive-o se se quiser ligar sem "
+"cifra."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"O seu servidor de SMTP diz que suporta o TLS mas a negociação falhou.\n"
+"O utilizador poderá desactivar o TLS na janela de configuração da conta SMTP."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "A Ligação Falhou"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Ocorreu um erro durante a autenticação: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Dados de autenticação não fornecidos."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Escolha um método de autenticação diferente."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "O seu servidor de SMTP não suporta o %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "O seu servidor de SMTP não suporta o (método não definido)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"O seu servidor de SMTP não suporta autenticação.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"A autenticação falhou.\n"
+"É provável que a senha esteja errada.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Não foi possível ler dados da aplicação."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"O conteúdo da mensagem não foi aceite.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"O servidor respondeu:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "O servidor respondeu: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Esta é uma falha temporária. Pode tentar novamente mais tarde."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "A aplicação enviou um pedido inválido."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Falta o endereço do remetente."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "O SMTPProtocol::smtp_open falhou (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"O seu servidor (%1) não suporta o envio de mensagens de 8-bit.\n"
+"Por favor utilize codificação 'base64' ou 'quoted-printable'."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "A escrita para o 'socket' foi mal-sucedida."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Resposta inválida de STMP (%1) recebida."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"O servidor (%1) não aceitou a ligação.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "O utilizador e senha para a sua conta de SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"O servidor não aceitou o endereço do remetente em branco.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"O servidor não aceitou o endereço do remetente \"%1\".\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"O envio da mensagem falhou uma vez que os seguintes destinatários foram "
+"rejeitados pelo servidor:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"A tentativa de iniciar o envio do conteúdo da mensagem falhou.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Condição de erro não tratada. Por favor envie um relatório de erro."
diff -Nru kmailtransport-16.12.3/po/pt/libmailtransport5.po kmailtransport-17.04.3/po/pt/libmailtransport5.po
--- kmailtransport-16.12.3/po/pt/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/pt/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,731 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-03-16 11:03+0000\n"
+"Last-Translator: José Nuno Coelho Pires <zepires@gmail.com>\n"
+"Language-Team: Portuguese <kde-i18n-doc@kde.org>\n"
+"Language: pt\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-POFile-SpellExtra: MD NTLM sendmail PLAIN STMP GSSAPI KWallet CRAM LOGIN\n"
+"X-POFile-SpellExtra: ASMTP DIGEST\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Identificador único"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Nome do transporte visível para o utilizador"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "O nome que será usado ao fazer referência a este servidor."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Sem nome"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "Servidor de SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Recurso do Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Tipo de transporte"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Nome do servidor"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "O nome do domínio ou o endereço numérico do servidor de STMP."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Número de porto do servidor"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"O número do porto onde o servidor de SMTP está à espera. O porto por omissão "
+"é o 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Utilizador necessário na autenticação"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "O nome do utilizador a enviar o servidor aquando da autorização."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Comando a executar antes de enviar um e-mail"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Um comando a executar localmente, antes de enviar o e-mail.  Pode ser usado "
+"para configurar túneis de SSH, por exemplo. Deixe em branco, se não deseja "
+"executar nenhum comando."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "O servidor necessita de autenticação"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Assinale esta opção se o seu servidor de SMTP necessitar de autenticação "
+"antes de aceitar o e-mail. Isto é conhecido como 'Autenticação em SMTP' ou "
+"simplesmente ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Guardar a senha"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Assinale esta opção para guardar a sua senha.\n"
+"Se o KWallet estiver disponível, a senha será guardada nele, o que é "
+"considerado seguro.\n"
+"Contudo, se o KWallet não estiver disponível, a senha será guardada no "
+"ficheiro de configuração.\n"
+"A senha é guardada de forma obscura, mas não deverá ser considerada segura "
+"com algum esforço de descodificação, se for possível aceder ao ficheiro de "
+"configuração."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Método de encriptação usado na comunicação"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Sem encriptação"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "Encriptação SSL"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "Encriptação TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Método de autenticação"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- POR FAZER -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Assinale esta opção para usar um nome de máquina personalizado, ao "
+"identificar-se no servidor de e-mail. Isto é útil quando o nome do seu "
+"sistema não estiver configurado correctamente ou para mascarar o nome "
+"verdadeiro do seu sistema."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+"Indique o nome da máquina que deverá usar para o servidor na identificação."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Assinale esta opção para usar um endereço de remetente de máquina "
+"personalizado, ao identificar-se no servidor de e-mail. Se não estiver "
+"assinalada, é usado o endereço da identidade."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Indique o endereço que deverá ser usado para substituir o endereço de "
+"remetente predefinido."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "A executar o pré-comando"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "A executar o pré-comando '%1'."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Não foi possível iniciar o pré-comando '%1'."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Ocorreu um erro ao executar o pré-comando '%1'."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "O pré-comando estoirou."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "O pré-comando saiu com o código %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Tem de indicar um nome de utilizador e uma senha para usar este servidor de "
+"SMTP."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Não é possível criar uma tarefa de SMTP."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Texto simples"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anónimo"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"O KWallet não está disponível. É altamente recomendado usar o KWallet para "
+"gerir as suas senhas.\n"
+"Contudo, a senha pode ser guardada no ficheiro de configuração em "
+"alternativa. A senha é guardada de forma obscura, mas não deverá ser "
+"considerada segura com algum esforço de descodificação, se for possível "
+"aceder ao ficheiro de configuração.\n"
+"Deseja guardar a senha para o servidor '%1' no ficheiro de configuração?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet Não Disponível"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Guardar a Senha"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Não Guardar a Senha"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "A conta de envio \"%1\" não está configurada correctamente."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Transporte por Omissão"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Deve criar uma conta de envio antes de enviar algo."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Criar uma Conta Agora?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Criar uma Conta Agora"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Configurar a conta"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Um servidor de SMTP na Internet"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Os seguintes transportes de correio guardam as senhas no ficheiro de "
+"configuração.\n"
+"Por razões de segurança, pense em migrar estas senhas para a KWallet, a "
+"ferramenta de gestão da Carteira do KDE, que guarda os dados importantes num "
+"ficheiro altamente encriptado.\n"
+"Deseja migrar as suas senhas para a KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Pergunta"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Migrar"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Manter"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Passo 1: Seleccionar o Tipo de Transporte"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Nome:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Tornar esta a conta de saída por omissão."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Seleccione um tipo de conta na lista abaixo:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Tipo"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Descrição"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Geral"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Informações da Conta"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "&Servidor de envio do correio:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "Uti&lizador:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "Senh&a:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "A senha a enviar para o servidor na autorização."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "Guardar a &senha de SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "O servidor necessita de &autenticação"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Avançado"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Configuração da Ligação"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Detectar Automaticamente"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Este servidor não suporta a autenticação"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Encriptação:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Nenhuma"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Porto:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Autenticação:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Configuração do SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Enviar um nome &de máquina específico para o servidor"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "&Máquina:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Usar um endereço de remetente personalizado"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Endereço do Remetente:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Pré-comando:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "Remo&ver"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "E&scolher por Omissão"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "A&dicionar..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "Muda&r o Nome"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Modificar..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Criar uma Conta de Saída"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Criar e Configurar"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Não foi possível obter as capacidades. Verifique por favor o porto e o modo "
+"de autenticação."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Verificação das Capacidades sem Sucesso"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Esta conta de envio não pode ser configurada."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Nome"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Tipo"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Por omissão)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Deseja remove a conta de envio '%1'?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Remover a conta de envio?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Adicionar..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Modificar..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Mudar o Nome"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Remover"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Escolher por Omissão"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "A mensagem está vazia."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "A mensagem não tem destinatários."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "A mensagem tem um transporte inválido."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "A mensagem tem uma pasta 'enviado' inválida."
diff -Nru kmailtransport-16.12.3/po/pt_BR/docs/kioslave5/smtp/index.docbook kmailtransport-17.04.3/po/pt_BR/docs/kioslave5/smtp/index.docbook
--- kmailtransport-16.12.3/po/pt_BR/docs/kioslave5/smtp/index.docbook	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/pt_BR/docs/kioslave5/smtp/index.docbook	2017-07-11 00:26:21.000000000 +0000
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
+<!ENTITY % addindex "IGNORE">
+<!ENTITY % Brazilian-Portuguese "INCLUDE"
+> <!-- change language only here -->
+]>
+	
+<article lang="&language;" id="smtp">
+<title
+>smtp</title>
+<articleinfo>
+<authorgroup>
+<author
+>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"
+><firstname
+>Lisiane</firstname
+> <surname
+>Sztoltz</surname
+><affiliation
+><address
+> <email
+>lisiane@conectiva.com.br</email
+></address
+></affiliation
+><contrib
+>Tradução</contrib
+></othercredit
+> 
+</authorgroup>
+</articleinfo>
+<para
+>Um protocolo para enviar e-mails de uma estação cliente para o servidor de e-mail. </para>
+
+<para
+>Veja : <ulink url="http://cr.yp.to/smtp.html"
+>Protocolo Simples de Transferência de E-mail</ulink
+>. </para>
+
+</article>
diff -Nru kmailtransport-16.12.3/po/pt_BR/kio_smtp.po kmailtransport-17.04.3/po/pt_BR/kio_smtp.po
--- kmailtransport-16.12.3/po/pt_BR/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/pt_BR/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,232 @@
+# Translation of kio_smtp.po to Brazilian Portuguese
+# Copyright (C) 2016 This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# André Marcelo Alvarenga <alvarenga@kde.org>, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-04-04 23:22-0300\n"
+"Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n"
+"Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Lokalize 2.0\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"O servidor rejeitou os comandos EHLO e HELO como desconhecidos ou não "
+"implementados.\n"
+"Por favor, contate o administrador do servidor."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Resposta inesperada do servidor para o comando %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Seu servidor SMTP não possui suporte a TLS. Desabilite o TLS se deseja "
+"conectar-se sem criptografia."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Seu servidor SMTP afirma suportar TLS, mas não houve sucesso na negociação.\n"
+"Você pode desabilitar o TLS no diálogo de configurações da conta SMTP."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Falha na conexão"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Ocorreu um erro durante a autenticação: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Nenhum detalhe sobre a autenticação foi fornecido."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Escolha um método de autenticação diferente."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Seu servidor SMTP não suporta %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Seu servidor SMTP não suporta (método não especificado)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Seu servidor SMTP não suporta autenticação.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Falha na autenticação.\n"
+"Provavelmente a sua senha está errada.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Não foi possível ler os dados do aplicativo."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"O conteúdo da mensagem não foi aceito.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"O servidor respondeu:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "O servidor respondeu: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Esta é uma falha temporária. Você pode tentar novamente mais tarde."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "O aplicativo enviou uma requisição inválida."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Está faltando o endereço do remetente."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "O SMTPProtocol::smtp_open falhou (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Seu servidor (%1) não suporta o envio de mensagens de 8 bits.\n"
+"Use a codificação base64 ou quoted-printable."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "A gravação para o soquete falhou."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "A resposta SMTP recebida (%1) é inválida."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"O servidor (%1) não aceitou a conexão.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Nome de usuário e senha de sua conta SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"O servidor não aceitou o endereço do remetente em branco.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"O servidor não aceitou o endereço do remetente \"%1\".\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Houve falha no envio da mensagem, visto que os seguintes destinatários foram "
+"rejeitados pelo servidor:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"A tentativa de iniciar o envio da mensagem falhou.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr ""
+"Condição de erro não processada. Por favor, envie um relatório de erro."
diff -Nru kmailtransport-16.12.3/po/pt_BR/libmailtransport5.po kmailtransport-17.04.3/po/pt_BR/libmailtransport5.po
--- kmailtransport-16.12.3/po/pt_BR/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/pt_BR/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,733 @@
+# Translation of libmailtransport5.po to Brazilian Portuguese
+# Copyright (C) 2007-2016 This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Diniz Bortolotto <diniz.bortolotto@gmail.com>, 2007.
+# André Marcelo Alvarenga <alvarenga@kde.org>, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016.
+# Luiz Fernando Ranghetti <elchevive@opensuse.org>, 2009, 2010.
+# Marcus Vinícius de Andrade Gama <marcus.gama@gmail.com>, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport5\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-03-16 08:16-0300\n"
+"Last-Translator: André Marcelo Alvarenga <alvarenga@kde.org>\n"
+"Language-Team: Brazilian Portuguese <kde-i18n-pt_br@kde.org>\n"
+"Language: pt_BR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Lokalize 2.0\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Identificador único"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Nome do transporte visível para o usuário"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "O nome que será usado quando se referir a este servidor."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Sem nome"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "Servidor SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Recurso do Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Tipo de transporte"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Nome do servidor"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "O nome do domínio ou o endereço numérico do servidor SMTP."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Número da porta do servidor"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"O número da porta que o servidor SMTP está escutando. A porta padrão é a 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Nome de usuário necessário para login"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "O nome de usuário a enviar para o servidor para autorização."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Comando a executar antes de enviar uma mensagem"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Um comando a executar localmente, antes de enviar um e-mail. Isto pode ser "
+"usado para definir túneis SSH, por exemplo. Deixe em branco se nenhum "
+"comando deve ser executado."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "O servidor requer autenticação"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Marque esta opção se o seu servidor SMTP requer autenticação antes de "
+"aceitar e-mails. Isto é conhecido como 'SMTP autenticado' ou simplesmente "
+"ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Armazenar senha"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Marque esta opção para ter sua senha armazenada.\n"
+"Se o KWallet estiver disponível, a senha será armazenada nele, o que é "
+"considerado seguro.\n"
+"De qualquer forma, se o KWallet não estiver disponível, a senha será "
+"armazenada no arquivo de configuração. A senha é armazenada em um formato "
+"ofuscado, mas não deve ser considerado seguro contra esforços de "
+"descodificação se for obtido acesso ao arquivo de configuração."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Método de criptografia usado na comunicação"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Sem criptografia"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "Criptografia SSL"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "Criptografia TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Método de autenticação"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- A FAZER -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Marque esta opção para usar um nome de máquina personalizado ao se "
+"identificar no servidor de e-mail. Isto é útil quando o nome de máquina do "
+"seu sistema não puder ser definido corretamente ou para mascarar o nome de "
+"máquina verdadeiro do seu sistema."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+"Informe o nome da máquina que deve ser usado quando se identificar para o "
+"servidor."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Marque esta opção para usar um remetente personalizado ao se identificar no "
+"servidor de e-mail. Se isto não estiver selecionado, o endereço de sua "
+"identidade é usado."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Informe o endereço que deve ser usado no lugar do endereço de remetente "
+"padrão."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Executando pré-comando"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Executando o pré-comando '%1'."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Não foi possível iniciar o pré-comando '%1'."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Ocorreu um erro na execução do pré-comando '%1'."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "O pré-comando travou."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "O pré-comando saiu com o código %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Você precisa informar um nome de usuário e uma senha para usar este servidor "
+"SMTP."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Não é possível criar uma tarefa de SMTP."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Texto simples"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anônimo"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Desconhecido"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"O KWallet não está disponível. É altamente recomendado usar o KWallet para "
+"gerenciar suas senhas.\n"
+"De qualquer forma, a senha será armazenada no arquivo de configuração. A "
+"senha é armazenada em um formato ofuscado, mas não deve ser considerado "
+"seguro contra esforços de decodificação se for obtido acesso ao arquivo de "
+"configuração.\n"
+"Deseja armazenar a senha para o servidor '%1' no arquivo de configuração?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "O KWallet não está disponível"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Armazenar senha"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Não armazenar senha"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "A conta de envio \"%1\" não está configurada corretamente."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Transporte padrão"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Você deve criar uma conta de envio antes de enviar."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Criar uma conta agora?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Criar uma conta agora"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Configurar conta"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Um servidor SMTP na Internet"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Os seguintes serviços de transporte de e-mail armazenam as senhas em um "
+"arquivo de configuração sem criptografia.\n"
+"Por motivo de segurança, considere a transferência dessas senhas para o "
+"KWallet, a ferramenta de gerenciamento de carteiras do KDE,\n"
+"onde os dados importantes para você são armazenados em um arquivo fortemente "
+"criptografado.\n"
+"Deseja migrar suas senhas para o KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Perguntar"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Migrar"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Manter"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "1° passo: Selecionar o tipo de transporte"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Nome:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Definir como conta de envio padrão."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Selecione um tipo de conta na lista abaixo:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Tipo"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Descrição"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Geral"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Informações da conta"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Servidor de envio de e-&mail:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Usuário:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "Senh&a:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "A senha a enviar para o servidor para autorização."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "Armazenar a &senha do SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "O servidor &requer autenticação"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Avançado"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Configurações da conexão"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Detectar automaticamente"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Este servidor não suporta autenticação"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Criptografia:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Nenhuma"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Porta:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Autenticação:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Configuração do SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Enviar um nome &de máquina personalizado ao servidor"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "&Máquina:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Usar um endereço de remetente personalizado"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Endereço do remetente:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Pré-comando:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "Remo&ver"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "&Definir como padrão"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "A&dicionar..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Renomear"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Modificar..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Criar uma conta de envio"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Criar e configurar"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Ocorreu uma falha ao verificar as capacidades. Verifique a porta e o modo de "
+"autenticação."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Falha na verificação das capacidades"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Esta conta de envio não pode ser configurada."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Nome"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Tipo"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Padrão)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Deseja remover a conta de envio '%1'?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Remover a conta de envio?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Adicionar..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Modificar..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Renomear"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Remover"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Definir como padrão"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Mensagem vazia."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "A mensagem não tem destinatários."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "A mensagem tem um transporte inválido."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "A mensagem tem uma pasta de e-mails enviados inválida."
diff -Nru kmailtransport-16.12.3/po/ro/kio_smtp.po kmailtransport-17.04.3/po/ro/kio_smtp.po
--- kmailtransport-16.12.3/po/ro/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ro/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,249 @@
+# translation of kio_smtp.po to Romanian
+# translation of @PACKAGE.po to @LANGUAGE
+# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc.
+#
+# Claudiu Costin <claudiuc@kde.org>, 2003, 2004, 2005.
+# Sergiu Bivol <sergiu@ase.md>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2009-01-02 14:33+0200\n"
+"Last-Translator: Sergiu Bivol <sergiu@ase.md>\n"
+"Language-Team: Romanian <kde-i18n-ro@lists.kde.org>\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 0.3\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Serverul a refuzat comenzile EHLO și HELO ca fiind necunoscute sau "
+"neimplementate.\n"
+"Contactați administratorul de sistem."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Răspuns neașteptat la comanda %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Serverul SMTP nu suportă TLS. Dezactivați suportul TLS dacă doriți să vă "
+"conectați fără a cripta conexiunea."
+
+#: command.cpp:197
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your SMTP server claims to support TLS, but negotiation was "
+#| "unsuccessful.\n"
+#| "You can disable TLS in KDE using the crypto settings module."
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Serverul SMTP declară că suportă TLS, dar negocierea nu a eșuat.\n"
+"Puteți dezactiva TLS în KDE folosind modulul de setare a opțiunilor de "
+"criptografie."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Conectarea a eșuat"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "A intervenit o eroare în timpul autentificării: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Nu au fost oferite informații de autentificare."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Alegeți o altă metodă de autentificare."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Serverul SMTP nu suportă %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Serverul SMTP nu suportă (metodă nespecificată)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Serverul SMTP nu suportă autentificare.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Autentificare eșuată.\n"
+"Probabil că parola este greșită.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Nu pot citi date din aplicație."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Conținutul mesajului nu a fost acceptat.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Serverul a răspuns:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Serverul a răspuns: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Aceasta este o eroare temporară. Puteți încerca mai târziu din nou."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Aplicația a trimis o cerere eronată."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Adresa expeditorului lipsește."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "Protocolul SMTP a eșuat (%1)"
+
+#: smtp.cpp:223
+#, fuzzy, kde-format
+#| msgid ""
+#| "Your server does not support sending of 8-bit messages.\n"
+#| "Please use base64 or quoted-printable encoding."
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Serverul dumneavoastră nu suportă trimiterea mesajelor cu caractere pe 8 "
+"biți.\n"
+"Încercați să utilizați codare \"base64\" sau \"text tipăribil\"."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Scrierea în soclu a eșuat."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Am primit un răspuns SMTP necorespunzător (%1)."
+
+#: smtp.cpp:537
+#, fuzzy, kde-format
+#| msgid ""
+#| "The server did not accept the connection.\n"
+#| "%1"
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Serverul nu acceptă conexiunea.\n"
+"%1"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Numele de utilizator și parola pentru contul SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Serverul nu acceptă o adresă nulă la expeditor.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Serverul nu acceptă adresa \"%1\" a expeditorului.\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Trimiterea mesajului a eșuat deoarece destinatarii de mai jos au fost "
+"respinși de către server:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Încercarea de începe trimiterea mesajului a eșuat.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr ""
+"Condiție de eroare neașteptată. Vă rog să trimiteți un raport de eroare."
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "Suportul pentru autentificare nu este prezent în kio_smtp."
diff -Nru kmailtransport-16.12.3/po/ro/libmailtransport5.po kmailtransport-17.04.3/po/ro/libmailtransport5.po
--- kmailtransport-16.12.3/po/ro/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ro/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,813 @@
+# Traducerea libmailtransport.po în Română
+# translation of libmailtransport to Romanian
+# Copyright (C) 2008 This_file_is_part_of_KDE
+# This file is distributed under the same license as the libmailtransport package.
+#
+# Laurenţiu Buzdugan <lbuz@rolix.org>, 2008".
+# Sergiu Bivol <sergiu-bivol@mail.md>, 2008.
+# Sergiu Bivol <sergiu@ase.md>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2009-08-22 18:40+0300\n"
+"Last-Translator: Sergiu Bivol <sergiu@ase.md>\n"
+"Language-Team: Română <kde-i18n-ro@kde.org>\n"
+"Language: ro\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < "
+"20)) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.0\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Identificator unic"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Denumirea vizibilă a transportului"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Numele utilizat la referirea la acest server."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, fuzzy, kde-format
+#| msgid "&Rename"
+msgid "Unnamed"
+msgstr "&Redenumește"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "Server SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Resursă Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Tip transport"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Numele gazdă al serverului"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Numele de domeniu sau adresa numerică a serverului SMTP."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Numărul portului pe server"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+"Numărul portului la care ascultă serverul SMTP. Portul implicit este 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Numele de utilizator pentru autentificare"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Numele de utilizator de trimis serverului pentru autorizare."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Comanda de executat înainte de a expedia un mesaj"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Serverul necesită autentificare"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Salvează parola"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, fuzzy, kde-format
+#| msgid ""
+#| "KWallet is not available. It is strongly recommended to use KWallet for "
+#| "managing your passwords.\n"
+#| "However, the password can be stored in the configuration file instead. "
+#| "The password is stored in an obfuscated format, but should not be "
+#| "considered secure from decryption efforts if access to the configuration "
+#| "file is obtained.\n"
+#| "Do you want to store the password for server '%1' in the configuration "
+#| "file?"
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Portofelul KDE nu este disponibil. Este extrem de indicat să-l folosiți "
+"pentru administrarea parolelor dumneavoastră.\n"
+"Totuși, parola poate fi salvată și în fișierul de configurare. Ea este "
+"scrisă într-un format anagramat, dar nu trebuie să-l considerați sigur "
+"contra decriptării odată ce a fost obținut accesul la fișierul de "
+"configurare.\n"
+"Doriți să salvați parola pentru serverul „%1” în fișierul de configurare?"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Metoda de criptare utilizată pentru comunicare"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Fără criptare"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "Criptare SSL"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "Criptare TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Metodă de autentificare"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, fuzzy, kde-format
+#| msgid "The name that will be used when referring to this server."
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Numele utilizat la referirea la acest server."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Executare precomandă"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Execut precomanda „%1”."
+
+#: kmailtransport/precommandjob.cpp:89
+#, fuzzy, kde-format
+#| msgid "Could not execute precommand '%1'."
+msgid "Unable to start precommand '%1'."
+msgstr "Nu am putut executa precomanda „%1”."
+
+#: kmailtransport/precommandjob.cpp:91
+#, fuzzy, kde-format
+#| msgid "Executing precommand '%1'."
+msgid "Error while executing precommand '%1'."
+msgstr "Execut precomanda „%1”."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Precomanda a eșuat."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Precomanda s-a terminat cu codul %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Trebuie să furnizați un utilizator și o parolă pentru a utiliza acest server "
+"SMTP."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Imposibil de creat sarcina SMTP."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr ""
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr ""
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Necunoscut"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"Portofelul KDE nu este disponibil. Este extrem de indicat să-l folosiți "
+"pentru administrarea parolelor dumneavoastră.\n"
+"Totuși, parola poate fi salvată și în fișierul de configurare. Ea este "
+"scrisă într-un format anagramat, dar nu trebuie să-l considerați sigur "
+"contra decriptării odată ce a fost obținut accesul la fișierul de "
+"configurare.\n"
+"Doriți să salvați parola pentru serverul „%1” în fișierul de configurare?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "Portofelul KDE nu e disponibil"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Salvează parola"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Nu salva parola"
+
+#: kmailtransport/transportjob.cpp:131
+#, fuzzy, kde-format
+#| msgid "The mail transport \"%1\" is not correctly configured."
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Transportul de poștă „%1” nu este configurat corect."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Transport implicit"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Trebuie să creați un cont de expediere înainte de a putea trimite."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Creați contul acum?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Creează contul acum"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Configurează cont"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Un server SMTP din Internet"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Întrebare"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Migrează"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Păstrează"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Pasul unu: Alegeți tipul transportului"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Denumire:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Fă acesta contul implicit de expediere."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Alegeți un tip de cont din lista de mai jos:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Tip"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Descriere"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "General"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, fuzzy, kde-format
+#| msgid "Outgoing mail &server:"
+msgid "Outgoing &mail server:"
+msgstr "&Server de expediere:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Utilizator:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "&Parolă:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Parola de trimis serverului pentru autorizare."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Salvează parola SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Serve&rul necesită autentificare"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Avansat"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Acest server nu suportă autentificarea"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, fuzzy, kde-format
+#| msgid "Encryption"
+msgid "Encryption:"
+msgstr "Criptare"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Niciuna"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, fuzzy, kde-format
+#| msgid "Authentication method"
+msgid "Authentication:"
+msgstr "Metodă de autentificare"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, fuzzy, kde-format
+#| msgid "&Host:"
+msgid "Hostna&me:"
+msgstr "Ga&zda:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Precomandă:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Elimină"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "&Stabilește ca implicit"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "A&dăugare..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Redenumește"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Modificare..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr ""
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Creează și configurează"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, fuzzy, kde-format
+#| msgid "This transport cannot be configured."
+msgid "This outgoing account cannot be configured."
+msgstr "Acest transport nu poate fi configurat."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Denumire"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Tip"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Implicit)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, fuzzy, kde-format
+#| msgid "Make this the default outgoing account."
+msgid "Remove outgoing account?"
+msgstr "Fă acesta contul implicit de expediere."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, fuzzy, kde-format
+#| msgid "A&dd..."
+msgid "Add..."
+msgstr "A&dăugare..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, fuzzy, kde-format
+#| msgid "&Modify..."
+msgid "Modify..."
+msgstr "&Modificare..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, fuzzy, kde-format
+#| msgid "&Rename"
+msgid "Rename"
+msgstr "&Redenumește"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, fuzzy, kde-format
+#| msgid "Remo&ve"
+msgid "Remove"
+msgstr "&Elimină"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, fuzzy, kde-format
+#| msgid "&Set as Default"
+msgid "Set as Default"
+msgstr "&Stabilește ca implicit"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Mesaj gol."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Mesajul nu are destinatari."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Mesajul are transport nevalid."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr ""
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Nume gaz&dă:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Sendmail local"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail s-a terminat în mod neașteptat."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail s-a terminat în mod neașteptat: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Instalare sendmail locală"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "&Locația Sendmail:"
+
+#, fuzzy
+#~| msgid "Outgoing mail &server:"
+#~ msgid "Mail &server:"
+#~ msgstr "&Server de expediere:"
+
+#~ msgid "text"
+#~ msgstr "text"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "&Verifică ce suportă serverul"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Metodă de autentificare"
+
+#~ msgid "&LOGIN"
+#~ msgstr "&LOGIN"
+
+#~ msgid "&PLAIN"
+#~ msgstr "&PLAIN"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "&GSSAPI"
+
+#~ msgid "&NTLM"
+#~ msgstr "&NTLM"
+
+#~ msgid "Transport: Sendmail"
+#~ msgstr "Transport: Sendmail"
+
+#~ msgid "Choos&e..."
+#~ msgstr "Aleg&e..."
+
+#~ msgid "Transport: SMTP"
+#~ msgstr "Transport: SMTP"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "Use Sendmail"
+#~ msgstr "Utilizează Sendmail"
+
+#~ msgid "Only local files allowed."
+#~ msgstr "Numai fișiere locale permise."
+
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "Adaugă transport"
+
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "Modifică transport"
diff -Nru kmailtransport-16.12.3/po/ru/docs/kioslave5/smtp/index.docbook kmailtransport-17.04.3/po/ru/docs/kioslave5/smtp/index.docbook
--- kmailtransport-16.12.3/po/ru/docs/kioslave5/smtp/index.docbook	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ru/docs/kioslave5/smtp/index.docbook	2017-07-11 00:26:21.000000000 +0000
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
+<!ENTITY % addindex "IGNORE">
+<!ENTITY % Russian "INCLUDE"
+> <!-- change language only here -->
+]>
+	
+<article lang="&language;" id="smtp">
+<title
+>smtp</title>
+<articleinfo>
+<authorgroup>
+<author
+>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"
+><firstname
+>Олег</firstname
+><surname
+>Баталов</surname
+><affiliation
+><address
+><email
+>olegbatalov@mail.ru</email
+></address
+></affiliation
+><contrib
+>Перевод на русский язык</contrib
+></othercredit
+> 
+</authorgroup>
+</articleinfo>
+<para
+>Протокол пересылки почты с клиентской рабочей станции на почтовый сервер. </para>
+
+<para
+>Смотрите <ulink url="http://cr.yp.to/smtp.html"
+>Simple Mail Transfer Protocol </ulink
+>. </para>
+
+</article>
diff -Nru kmailtransport-16.12.3/po/ru/kio_smtp.po kmailtransport-17.04.3/po/ru/kio_smtp.po
--- kmailtransport-16.12.3/po/ru/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ru/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,243 @@
+# translation of kio_smtp.po into Russian
+# translation of kio_smtp.po to Russian
+#
+# KDE3 - kdebase/kio_smtp.pot Russian translation.
+# Copyright (C) 2002, KDE Russian translation Team.
+#
+# Gregory Mokhin <mok@kde.ru>, 2002, 2005.
+# Leonid Kanter <leon@asplinux.ru>, 2004.
+# Andrey Cherepanov <skull@kde.ru>, 2009.
+# Alexander Potashev <aspotashev@gmail.com>, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2011-03-16 22:58+0300\n"
+"Last-Translator: Alexander Potashev <aspotashev@gmail.com>\n"
+"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.2\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Environment: kde\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Сервер отверг обе команды EHLO и HELO как неизвестные или нереализованные.\n"
+"Свяжитесь с системным администратором этого сервера."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Недопустимый ответ сервера на команду «%1».\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Сервер SMTP не поддерживает TLS. Запретите использование TLS, если можно "
+"применять соединение без шифрования."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Сервер SMTP заявляет о поддержке TLS, но согласование завершилось неудачей.\n"
+"Вы можете запретить использование TLS в диалоговом окне настройки учётной "
+"записи SMTP."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Ошибка подключения"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Ошибка идентификации: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Не указаны сведения для идентификации."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Выберите другой метод идентификации."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Сервер SMTP не поддерживает %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Неизвестный метод идентификации."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Сервер SMTP не поддерживает идентификацию.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Ошибка идентификации.\n"
+"Вероятная причина — неверный пароль.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Невозможно получить данные от приложения."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Содержимое письма не было принято.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Ответ сервера:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Ответ сервера: «%1»"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Это временная ошибка. Повторите попытку позже."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Отправлен неверный запрос от приложения."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Отсутствует адрес отправителя."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "Ошибка при выполнении SMTPProtocol::smtp_open (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Сервер (%1) не поддерживает отправку 8-битных писем.\n"
+"Используйте кодировку base64 или quoted-printable."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Ошибка записи в сокет."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Получен неверный ответ SMTP (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Сервер (%1) отверг соединение.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Имя и пароль учётной записи SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Сервер не принял пустой адрес отправителя.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Сервер не принял адрес отправителя «%1».\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Письмо не отправлено, потому что следующие получатели были отвергнуты "
+"сервером:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Ошибка при отправке содержимого письма.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Неизвестная ошибка. Отправьте отчёт об ошибке в программе."
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "Поддержка идентификации не была включена при сборке kio_smtp."
diff -Nru kmailtransport-16.12.3/po/ru/libmailtransport5.po kmailtransport-17.04.3/po/ru/libmailtransport5.po
--- kmailtransport-16.12.3/po/ru/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ru/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,758 @@
+# Zhitomirsky Sergey <szh@7ka.mipt.ru>, 2000.
+# Gregory Mokhin <mok@kde.ru>, 2001,2003-2005.
+# Andrey Cherepanov <sibskull@mail.ru>, 2001-2006.
+# Albert R. Valiev <darkstar@altlinux.ru>, 2002.
+# Leonid Kanter <leon@asplinux.ru>, 2002-2004.
+# Nick Shaforostoff <shafff@ukr.net>, 2004-2007.
+# Andrey Cherepanov <skull@kde.ru>, 2009.
+# Alexey Serebryakoff <overlapped@kde.ru>, 2010.
+# Alexander Potashev <aspotashev@gmail.com>, 2010, 2011, 2014, 2016.
+# Alexander Lakhin <exclusion@gmail.com>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: kmail\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-08-15 02:07+0300\n"
+"Last-Translator: Alexander Potashev <aspotashev@gmail.com>\n"
+"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Environment: kde\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Уникальный идентификатор"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Отображаемое название метода отправки."
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Название, используемое при обращении к серверу."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Без имени"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "Сервер SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Источник данных Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Тип транспорта"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Имя сервера"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Доменное имя или IP-адрес сервера SMTP."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Номер порта на сервере"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "Номер порта сервера SMTP. Порт по умолчанию: 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Имя пользователя на сервере"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Имя пользователя для доступа на сервер."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Программа, выполняемая перед отправкой письма"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Команда, выполняемая на этом компьютере перед отправкой письма. Может быть "
+"использована для включения туннелей SSH. Оставьте это поле пустым, если в "
+"нём нет необходимости."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Сервер требует идентификацию"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Включите данный параметр, если ваш сервер SMTP требует аутентификацию перед "
+"доставкой почты."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Сохранить пароль"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Включите данный параметр для сохранения пароля.\n"
+"Если доступен бумажник KDE, пароль будет сохранён в нём.\n"
+"Если бумажник KDE недоступен, пароль будет сохранён в конфигурационном "
+"файле. Пароль будет сохранён в нечитаемом формате, однако при получении "
+"доступа к файлу конфигурации возможна расшифровка вашего пароля."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Используемый тип шифрования"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Без шифрования"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "Шифрование SSL"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "Шифрование TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Способ идентификации"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- Не реализовано -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Включите этот параметр для использования указанного имени узла для "
+"идентификации на почтовом сервере. Обычно это используется для "
+"корректирования посылаемого имени узла или для маскировки реального имени "
+"вашего компьютера."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Введите имя узла, используемого во время идентификации на сервере."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Включите этот параметр для использования указанного адреса отправителя при "
+"аутентификации на почтовом сервере. В противном случае будет использован "
+"адрес электронной почты из вашего профиля."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Введите адрес электронной почты, который будет использован вместо адреса "
+"отправителя по умолчанию."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Выполнение программы"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Выполнение программы «%1»."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Не удалось запустить программу «%1»."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Ошибка при выполнении программы «%1»."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Ошибка выполнения программы."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Программа завершила работу с кодом %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Для отправки почты через этот сервер SMTP требуется указать имя пользователя "
+"и пароль."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Невозможно открыть сеанс SMTP."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 №%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Открытый текст"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Анонимно"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Неизвестный"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"Бумажник KDE недоступен. Мы настойчиво рекомендуем использовать бумажник KDE "
+"для хранения ваших паролей.\n"
+"Пароль может быть сохранён и в конфигурационном файле. Он сохраняется в "
+"нечитаемом формате, однако при получении доступа к файлу конфигурации "
+"возможна расшифровка вашего пароля.\n"
+"Вы хотите сохранить пароль для доступа к серверу «%1» в файле конфигурации?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "Бумажник KDE недоступен"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Сохранить пароль"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Не сохранять пароль"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Учётная запись «%1» не настроена должным образом."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Транспорт по умолчанию"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Сначала необходимо создать учётную запись для отправки почты."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Создать учётную запись сейчас?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Создать учётную запись"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Настроить учётную запись"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Сервер SMTP в Интернете"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Следующие почтовые транспорты хранят пароли в незашифрованном "
+"конфигурационном файле.\n"
+"Мы рекомендуем перенести пароли в бумажник KDE, который безопасно хранит "
+"пароли и прочие важные данные.\n"
+"Перенести пароли в бумажник KDE?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Вопрос"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Перенести в бумажник"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Оставить в файлах"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Шаг 1: Выбрать метод отправки"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Название:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Сделать учётной записью исходящей почты по умолчанию"
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Выберите тип учётной записи:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Тип"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Описание"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Главное"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Сведения об учётной записи"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "&Сервер исходящей почты:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Имя пользователя:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "&Пароль:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Пароль для идентификации на сервере."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Сохранить пароль SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Сервер требует &идентификацию"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Дополнительно"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Параметры подключения"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Автоопределение"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Сервер не требует идентификацию"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Шифрование:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Нет"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "По&рт:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Аутентификация:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Параметры SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "&Отправить указанное имя хоста на сервер"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "&Имя хоста:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Использовать другой адрес отправителя"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Адрес отправителя:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Предварительная команда:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "Удалит&ь"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Сделать &основным"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "&Добавить..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Переименовать"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Изменить..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Создать учётную запись исходящей почты"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Создать и настроить"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Не удалось определить возможности сервера. Проверьте правильность указания "
+"порта и способа аутентификации."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Ошибка определения возможностей"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Эту учётную запись настроить нельзя."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Название"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Тип"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (по умолчанию)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Вы хотите удалить учётную запись исходящей почты «%1»?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Удалить учётную запись?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Добавить..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Изменить..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Переименовать"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Удалить"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Сделать основным"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Пустое письмо."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "В письме не указаны получатели."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Недопустимый метод отправки письма."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Недопустимая папка для отправленной почты."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Имя &узла:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Локальный Sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Ошибка запуска почтовой программы «%1»"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Аварийное завершение Sendmail."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Аварийное завершение Sendmail: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Локальный Sendmail"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "&Путь к программе Sendmail:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "Почтовый &сервер:"
diff -Nru kmailtransport-16.12.3/po/sk/kio_smtp.po kmailtransport-17.04.3/po/sk/kio_smtp.po
--- kmailtransport-16.12.3/po/sk/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/sk/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,228 @@
+# translation of kio_smtp.po to Slovak
+# Stanislav Visnovsky <visnovsky@nenya.ms.mff.cuni.cz>, 2002.
+# Stanislav Visnovsky <visnovsky@kde.org>, 2003, 2004.
+# Richard Fric <Richard.Fric@kdemail.net>, 2006, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2012-07-09 12:21+0100\n"
+"Last-Translator: Roman Paholík <wizzardsk@gmail.com>\n"
+"Language-Team: Slovak <kde-sk@linux.sk>\n"
+"Language: sk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.1\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Server odmietol príkazy EHLO aj HELO ako neznáme alebo neimplementované.\n"
+"Prosím, kontaktujte administrátora tohto serveru."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Neočakávaná odpoveď serveru na príkaz %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Váš server SMTP nepodporuje TLS. Vypnite TLS ak sa chcete pripojiť bez "
+"šifrovania."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Váš SMTP server tvrdí, že podporuje TLS, ale test nebol úspešný.\n"
+"V module nastavenia SMTP účtu môžete vypnúť použitie TLS."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Spojenie zlyhalo"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Počas autentifikácie nastala chyba: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Žiadne detaily overenia neboli poskytnuté."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Zvoľte inú metódu overenia."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Váš SMTP server nepodporuje %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Váš server SMTP nepodporuje (nešpecifikovaná metóda)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Váš server SMTP nepodporuje overenie.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Prihlásenie zlyhalo.\n"
+"Asi je nesprávne heslo.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Nepodarilo sa prečítať dáta z aplikácie."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Obsah správy nebol akceptovaný.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Odpoveď serveru:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Odpoveď serveru: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Toto je dočasné zlyhanie. Skúste to neskôr."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Aplikácia poslala neplatný požiadavok."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Neuvedená adresa odosielateľa."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "Volanie SMTPProtocol::smtp_open zlyhalo (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Váš server (%1) nepodporuje posielanie 8-bitových správ.\n"
+"Prosím, použite kódovanie base64 alebo quoted-printable."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Zápis do socketu zlyhal."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Prijatá neplatná odpoveď SMTP (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Server (%1) neakceptoval pripojenie.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Meno a heslo pre váš účet SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Server neakceptoval prázdu adresu odosielateľa.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Server neakceptoval adresu odosielateľa \"%1\".\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Poslanie správy zlyhalo, pretože server odmietol týchto príjemcov:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Pokus o spustenie odosielania obsahu správy zlyhal.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Nespracovaná chybová situácia. Prosím, pošlite správu o chybe."
diff -Nru kmailtransport-16.12.3/po/sk/libmailtransport5.po kmailtransport-17.04.3/po/sk/libmailtransport5.po
--- kmailtransport-16.12.3/po/sk/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/sk/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,745 @@
+# translation of libmailtransport5.po to Slovak
+# Roman Paholík <wizzardsk@gmail.com>, 2014, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport5\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-03-15 19:43+0100\n"
+"Last-Translator: Roman Paholik <wizzardsk@gmail.com>\n"
+"Language-Team: Slovak <kde-sk@linux.sk>\n"
+"Language: sk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Jedinečný identifikátor"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Názov prenosu viditeľný pre používateľa"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Meno ktoré bude použité pri odkazovaní na tento server."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Nepomenované"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP Server"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Zdroj Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Transportný typ"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Hostiteľské meno servera"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Doménové meno alebo číselná adresa SMTP servera."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Číslo portu servera"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "Číslo portu na ktorom počúva SMTP server. Východzí port je 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Uživateľské meno potrebné pre prihlásenie"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Uživateľské meno ktoré sa posiela na servver pri prihlasovaní."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "príkaz ktorý sa vykoná predtým ako sa pošle mail."
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Príkaz na miestne spistenie, pred poslaním e-mailu. Môže sa použie na "
+"nastavenie SSH tunela, napríklad. Nechajte prázdne, ak nechcete spúšťať "
+"príkaz."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Server vyžaduje autentifikáciu"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Označte ak váš SMTP server vyžaduje overenie pred akceptovaním e-mailu. Toto "
+"je známe ako 'Authenticated SMTP' alebo iba ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Uložiť heslo"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Označte ak chcete uložiť vaše heslo.\n"
+"Ak je dostupný KWallet, heslo sa uloží tam, čo sa považuje za bezpečné.\n"
+"Ak nie je KWallet dostupný, heslo sa uloží do konfiguračného súboru. Heslo "
+"sa uloží v zatemnenom formáte, ale nedá sa to považovať za bezpečné pred "
+"snahami o dešifrovanie, ak niekto získa váš konfiguračný súbor."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Kryptovacia metóda použitá pri komunikácii"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Nekryptované"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL kryptovanie"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS kryptovanie"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Autentifikačná metóda"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Označte túto možnosť aby sa použilo vložené uživateľské meno hostiteľa pri "
+"identifikácii na server.Je to užitočné ak nemáte správne nastavené systémové "
+"meno hostiteľa alebo ho chcete maskovať.      "
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+"Vložte meno hostiteľa ktoré môže byť použité keď sa identifikujete serveru."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Označte túto možnosť aby sa použila vložená e-mailová adresa pri "
+"identifikácii na server. Ak nie je označené, použije sa adresa "
+"identity.      "
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Zadajte adresu, ktorá sa má použiť na prepísanie predvolenej adresy servera."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Vykonávanie predpríkazu"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Vykonávanie predpríkazu '%1'."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Chyba spustenia predpríkazu '%1'."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Chyba počas vykonávania predpríkazu '%1'."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Predpríkaz padol."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Predpríkaz skončil s kódom %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Musíte vyplniť uživateľské meno a heslo aby ste mohli použiť tento SMTP "
+"server."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Nie je možné vytvoriť úlohu SMTP."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Vyčistiť text"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anonym"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Neznáme"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet nie je dostupný. Doporučuje sa použiť KWallet pre správu vašich "
+"hesiel.\n"
+"Aj keď môže byť heslo uložené v konfiguračnom súbore v pozmenenej forme, to "
+"však nemôže byť brané ako bezpečné ak niekto získa prístup ku konfiguračnému "
+"súboru.\n"
+"Chcete uložiť heslo pre server '%1' v konfiguračnom súbore?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet nie je dostupný"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Uložiť heslo"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Neukladať heslo"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Odchádzajúci účet \"%1\" nie je správne nastavený."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Východzí transport"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Pred poslaním musíte vytvoriť odchádzajúci účet."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Vytvoriť účet teraz?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Vytvoriť účet teraz"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Nastaviť účet"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "SMTP server na Internete"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Nasledujúce mailové transporty ukladajú svoje heslá v nekryptovanom "
+"konfiguračnom súbore.\n"
+"Z bezpečnostných dôvodov zvážte presun týchto hesiel do KWalletu,\n"
+"ktorý ukladá citlivé dáta v silne kryptovanom súbore.\n"
+"Chcete presunúť svoje heslá do KWalletu? "
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Otázka"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Presunúť"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Ponechať"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Prvý krok: Vybrať typ prenosu"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Názov:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Označiť ako predvolený odchádzajúci účet."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Vyberte typ účtu zo zoznamu:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Typ"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Popis"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Všeobecné"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Informácie o účte"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Server odchádzajúcej pošty:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Prihlasovacie meno:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "H&eslo:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Heslo ktoré bude poslané serveru kvôli autentifikácii."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "Ulož &SMTP heslo"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Se&rver vyžaduje autentifikáciu"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Pokročilé"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Nastavenie pripojenia"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Automatická detekcia"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Tento server nepodporuje autentifikáciu"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Šifrovanie:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "Ži&adne"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Overenie:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Nastavenie SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Poslať uživateľove meno hostiteľa serveru(&d)"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "Meno hos&titeľa:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Použiť vlastnú adresu odosielateľa"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Adresa odosielateľa:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Predpríkaz:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "Odst&rániť"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Nastaviť ako predvolené"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "Pridať..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "P&remenovať"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Upraviť..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Vytvoriť odchádzajúci účet"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Vytvoriť a nastaviť"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Zlyhalo skontrolovanie schopností. Prosím, skontrolujte port a režim "
+"overenia."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Kontrola schopností zlyhala"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Tento odchádzajúci účet nie je možné nastaviť."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Meno"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Typ"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Predvolené)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Chcete vymazať odchádzajúci účet '%1'?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Odstrániť odchádzajúci účet?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Pridať..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Upraviť..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Premenovať"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Odstrániť"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Nastaviť ako predvolené"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Prázdna správa."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Správa nemá žiadnych prijímateľov."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Správa má neplatný prenos."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Správa má neplatný priečinok odoslanej pošty."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Meno hos&titeľa:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Lokálny sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Nepodarilo sa vykonať mailovací program %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail skončil nenormálne."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail skončil nenormálne: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Miestna inštalácia sendmail"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Umiestnenie Sendmail:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "Poštový server:"
diff -Nru kmailtransport-16.12.3/po/sl/kio_smtp.po kmailtransport-17.04.3/po/sl/kio_smtp.po
--- kmailtransport-16.12.3/po/sl/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/sl/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,237 @@
+# Translation of kio_smtp.po to Slovenian
+# SLOVENIAN TRANSLATION OF KIO_SMTP.
+# Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# $Id: kio_smtp.po 1486852 2017-04-07 03:05:00Z scripty $
+# $Source$
+#
+# Gregor Rakar <gregor.rakar@kiss.uni-lj.si>, 2002.
+# Gregor Rakar <gregor.rakar@kiss.si>, 2003, 2004, 2005.
+# Andrej Vernekar <andrej.vernekar@moj.net>, 2007, 2008, 2011.
+# Jure Repinc <jlp@holodeck1.com>, 2009.
+# Andrej Mernik <andrejm@ubuntu.si>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2014-08-29 13:40+0200\n"
+"Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n"
+"Language-Team: Slovenian <lugos-slo@lugos.si>\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Strežnik je zavrnil oba ukaza EHLO in HELO kot neznana in nepodprta.\n"
+"Obvestite skrbnika strežnika."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Nepričakovan odgovor strežnika na ukaz %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Vaš strežnik SMTP ne podpira TLS. Onemogočite TLS, če se želite povezati "
+"brez šifriranja."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Vaš strežnik SMTP trdi, da podpira TLS, a pogajanja niso uspela.\n"
+"TLS lahko onemogočite v nastavitvah računa SMTP."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Povezava ni uspela"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Med overitvijo je prišlo do napake: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Ni podanih overitvenih podatkov."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Izberite drugi način overitve."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Vaš strežnik SMTP ne podpira %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Vaš strežnik SMTP ne podpira (nedoločen način)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Vaš strežnik SMTP ne podpira overitve.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Overitev je spodletela.\n"
+"Najverjetneje je geslo napačno.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Ni bilo mogoče prebrati podatkov iz programa."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Vsebina sporočila ni bila sprejeta.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Strežnik je odgovoril:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Strežnik je odgovoril: »%1«"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "To je začasna napaka. Poskusite lahko kasneje."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Program je poslal neveljavno zahtevo."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Manjka naslov pošiljatelja."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open ni uspel (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Vaš strežnik (%1) ne podpira pošiljanja 8-bitnih sporočil.\n"
+"Uporabite kodiranje base64 ali »quoted-printable«."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Pisanje v vtič ni uspelo."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Prejet je bil neveljaven odgovor SMTP (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Strežnik (%1) ni sprejel povezave.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Uporabniško ime in geslo za vaš račun SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Strežnik ni sprejel praznega naslova pošiljatelja.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Strežnik ni sprejel naslova pošiljatelja »%1«.\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Pošiljanje sporočila ni uspelo, ker je strežnik zavrnil naslednje "
+"prejemnike:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Poskus začetka pošiljanja vsebine sporočila ni uspel.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Neobravnavan pogoj napake. Pošljite poročilo o hrošču."
diff -Nru kmailtransport-16.12.3/po/sl/libmailtransport5.po kmailtransport-17.04.3/po/sl/libmailtransport5.po
--- kmailtransport-16.12.3/po/sl/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/sl/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,748 @@
+# translation of libmailtransport.po to Slovenian
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Andrej Vernekar <andrej.vernekar@gmail.com>, 2007, 2008, 2011, 2012.
+# Jure Repinc <jlp@holodeck1.com>, 2009, 2012, 2013.
+# Andrej Mernik <andrejm@ubuntu.si>, 2015, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-09-01 17:31+0200\n"
+"Last-Translator: Andrej Mernik <andrejm@ubuntu.si>\n"
+"Language-Team: Slovenian <lugos-slo@lugos.si>\n"
+"Language: sl\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
+"%100==4 ? 3 : 0);\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Edinstven določilnik"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Ime prenosa, vidno uporabniku"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Ime, ki se bo uporabilo ob sklicevanju na ta strežnik."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Neimenovan"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "Strežnik SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Vir Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Vrsta prenosa"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Gostiteljsko ime strežnika"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Domensko ime ali številčni naslov strežnika SMTP."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Številka vrat strežnika"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "Vrata, na katerih posluša strežnik SMTP. Privzeta vrata so 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Uporabniško ime zahtevano za prijavo"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Uporabniško ime, ki se bo poslalo strežniku za pooblastitev."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Ukaz, ki se naj izvede pred pošiljanjem sporočila"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Ukaz, ki naj se zažene krajevno, pred pošiljanjem pošte. To lahko na primer "
+"uporabite za vzpostavitev tunelov SSH. Če ne želite, da se zažene kak ukaz, "
+"pustite prazno."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Strežnik zahteva overitev"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Označite to možnost, če strežnik SMTP pred sprejemanjem pošte zahteva "
+"overitev. To je poznano kot »Overjen SMTP« ali ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Shrani geslo"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Označite to možnost, da se vaše geslo shrani.\n"
+"Če je KWallet voljo, bo geslo shranjeno v njem, kar je mišljeno kot varno.\n"
+"Če pa KWallet ni na voljo, se lahko geslo shrani v nastavitveno datoteko. "
+"Geslo je shranjeno v zapleteni obliki, vendar ne smete misliti, da je varno "
+"pred poskusi odšifriranja, če je pridobljen dostop do nastavitvene datoteke."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Način šifriranja, ki se uporablja za sporazumevanje"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Brez šifriranja"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "Šifriranje SSL"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "Šifriranje TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Način overitve"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- OPRAVILO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Označite to možnost, če želite za identifikacijo pri poštnem strežniku "
+"uporabiti ime gostitelja po meri. To je uporabno, če ime vašega računalnika "
+"ni nastavljeno pravilno, ali pa če želite prikriti pravo ime računalnika."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+"Vnesite ime gostitelja, ki naj se uporabi med identifikacijo pri strežniku."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Označite to možnost, če želite za identifikacijo pri poštnem strežniku "
+"uporabiti naslov pošiljatelja po meri. Če ni označeno, se uporabi naslov iz "
+"istovetnosti."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Vnesite naslov, ki naj se uporabi za prepis privzetega naslova pošiljatelja."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Izvajanje predukaza"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Izvajanje predukaza »%1«."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Ni mogoče zagnati predukaza »%1«."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Napaka med izvajanjem predukaza »%1«."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Predukaz se je sesul."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Predukaz je končal s kodo %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Za dostop do tega strežnika morate posredovati uporabniško ime in geslo."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Ni mogoče ustvariti posla SMTP."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Navadno besedilo"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anonimno"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Neznana"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet ni na voljo. Priporočena je uporaba KWallet za upravljanje z gesli.\n"
+"Kljub temu se lahko geslo shrani v nastavitveno datoteko. Geslo je shranjeno "
+"v zapleteni obliki, vendar ne smete misliti, da je varno pred poskusi "
+"odšifriranja, če je pridobljen dostop do nastavitvene datoteke.\n"
+"Ali želite shraniti geslo za strežnik »%1« v nastavitveno datoteko?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet ni na voljo"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Shrani geslo"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Ne shrani gesla"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Račun za pošiljanje »%1« ni nastavljen pravilno."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Privzet prenos"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Pred pošiljanjem morate ustvariti račun za pošiljanje."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Ustvarim nov račun?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Ustvari nov račun"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Nastavi račun"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "Strežnik SMTP na internetu"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Naslednji prenosi za pošto shranjujejo gesla v nešifrirano nastavitveno "
+"datoteko.\n"
+"Iz varnostnih razlogov razmislite o selitvi teh gesel v KWallet, KDE-jevo "
+"orodje za upravljanje z listnicami,\n"
+"ki občutljive podatke hrani v močno šifrirani datoteki.\n"
+"Ali želite svoja gesla preseliti v KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Vprašanje"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Preseli"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Ohrani"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Prvi korak: izberite način prenosa"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Ime:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Nastavi kot privzet račun za pošiljanje."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "S spodnjega seznama izberite vrsto računa:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Vrsta"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Opis"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Splošno"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Podatki o računu"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Strežnik za pošiljanje &pošte:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Prijava:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "&Geslo:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Geslo, ki naj se pošlje strežniku za pooblastitev."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Shrani geslo SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Strežnik zahteva o&veritev"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Napredno"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Nastavitve povezave"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Samodejno zaznaj"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Ta strežnik ne podpira overitve"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Šifriranje:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Brez"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Vrata:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Overjanje:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Nastavitve SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "P&ošlji strežniku ime gostitelja po meri"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "I&me gostitelja:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Uporabi naslov pošiljatelja po meri"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Naslov pošiljatelja:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Predukaz:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Odstrani"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Na&stavi kot privzet"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "Dod&aj ..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "Pre&imenuj"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "Spre&meni ..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Ustvari račun za pošiljanje"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Ustvari in nastavi"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr "Zmožnosti ni bilo mogoče preveriti. Preverite vrata in način overitve."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Preverjanje zmožnosti ni uspelo"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Računa za pošiljanje ni mogoče nastaviti."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Ime"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Vrsta"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (privzet)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Ali želite odstraniti račun za pošiljanje »%1«?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Odstranim račun za pošiljanje?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Dodaj ..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Spremeni ..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Preimenuj"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Odstrani"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Nastavi kot privzeto"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Prazno sporočilo."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Sporočilo nima prejemnikov."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Sporočilo ima neveljaven prenos."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Sporočilo ima neveljavno mapo »poslana pošta«."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Ime &gostitelja:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Krajevni sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Ni bilo mogoče izvesti poštnega programa %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail se je končal neobičajno."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail se je končal neobičajno: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Krajevna namestitev sendmaila"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "&Mesto sendmaila:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "Poštni &strežnik:"
diff -Nru kmailtransport-16.12.3/po/sr/docs/kioslave5/smtp/index.docbook kmailtransport-17.04.3/po/sr/docs/kioslave5/smtp/index.docbook
--- kmailtransport-16.12.3/po/sr/docs/kioslave5/smtp/index.docbook	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/sr/docs/kioslave5/smtp/index.docbook	2017-07-11 00:26:21.000000000 +0000
@@ -0,0 +1,49 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
+<!ENTITY % addindex "IGNORE">
+<!ENTITY % Serbian "INCLUDE"
+> <!-- change language only here -->
+]>
+	
+<article lang="&language;" id="smtp">
+<title
+>СМТП</title>
+<articleinfo>
+<authorgroup>
+<author
+><personname
+><firstname
+>Фердинанд</firstname
+> <surname
+>Гасауер</surname
+></personname
+> &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"
+><firstname
+>Драган</firstname
+><surname
+>Пантелић</surname
+><affiliation
+><address
+><email
+>falcon-10@gmx.de</email
+></address
+></affiliation
+><contrib
+>превод</contrib
+></othercredit
+> 
+</authorgroup>
+</articleinfo>
+<para
+>Протокол који шаље пошту са клијентске радне станице на поштански сервер. </para>
+
+<para
+>Погледајте: <ulink url="http://cr.yp.to/smtp.html"
+><foreignphrase lang="en"
+>Simple Mail Transfer Protocol</foreignphrase
+></ulink
+>. </para>
+
+</article>
diff -Nru kmailtransport-16.12.3/po/sr/kio_smtp.po kmailtransport-17.04.3/po/sr/kio_smtp.po
--- kmailtransport-16.12.3/po/sr/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/sr/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,233 @@
+# Translation of kio_smtp.po into Serbian.
+# Toplica Tanaskovic <toptan@kde.org.yu>, 2003, 2004.
+# Chusslove Illich <caslav.ilic@gmx.net>, 2005, 2007, 2009, 2010.
+# Dalibor Djuric <dalibor.djuric@mozilla-srbija.org>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-07-01 11:44+0200\n"
+"Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
+"Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
+"Language: sr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+"X-Environment: kde\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Сервер је одбацио и наредбу <command>EHLO</command> и <command>HELO</"
+"command> као непознате или неизведене.\n"
+"Обратите се систем-администратору сервера."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Неочекивани одзив сервера на наредбу <command>%1</command>.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"СМТП сервер не подржава ТЛС. Искључите ТЛС ако желите да се повезујете без "
+"шифровања."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"СМТП сервер тврди да подржава ТЛС, али преговарање није успело.\n"
+"ТЛС можете искључити у дијалогу поставки СМТП налога."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Неуспело повезивање"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Грешка при аутентификацији: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Нису дати детаљи за аутентификацију."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Изаберите други метод аутентификације."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr ""
+"Дати СМТП сервер не подржава %1.|/|Дати СМТП сервер не подржава $[аку %1]."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Дати СМТП сервер не подржава (неодређени метод)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Дати СМТП сервер не подржава аутентификацију.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Неуспела аутентификација.\n"
+"Вероватно је лозинка погрешна.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Не могу да прочитам податке из програма."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Садржај поруке није прихваћен.\n"
+"%1 "
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Сервер јавља:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Сервер јавља: „%1“"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Привремени неуспех. Можете да покушате поново касније."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Програм је послао неисправан захтев."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Недостаје адреса пошиљаоца."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open није успео (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Сервер (%1) не подржава слање 8‑битних порука.\n"
+"Користите кодирање база64 или навод-читко."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Неуспео упис у сокет."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Примљен погрешан СМТП одзив (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Сервер (%1) није прихватио везу.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Корисничко име и лозинка СМТП‑а налога:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Сервер није прихватио празну адресу пошиљаоца.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Сервер није прихватио адресу пошиљаоца „%1“.\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Слање поруке није успело зато што је сервер одбацио следеће примаоце:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Покушај слања садржаја поруке није успео.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Непозната грешка. Молимо поднесите извештај о овоме."
diff -Nru kmailtransport-16.12.3/po/sr/libmailtransport5.po kmailtransport-17.04.3/po/sr/libmailtransport5.po
--- kmailtransport-16.12.3/po/sr/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/sr/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,734 @@
+# Translation of libmailtransport5.po into Serbian.
+# Chusslove Illich <caslav.ilic@gmx.net>, 2007, 2008, 2009, 2010, 2012, 2013, 2014, 2016.
+# Dalibor Djuric <daliborddjuric@gmail.com>, 2009, 2010, 2011.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport5\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-03-20 14:18+0100\n"
+"Last-Translator: Chusslove Illich <caslav.ilic@gmx.net>\n"
+"Language-Team: Serbian <kde-i18n-sr@kde.org>\n"
+"Language: sr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Accelerator-Marker: &\n"
+"X-Text-Markup: kde4\n"
+"X-Environment: kde\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Јединствени идентификатор"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Име транспорта видљиво кориснику"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Име које се користи при помињању овог сервера."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Безимени"
+
+# >> @item
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "СМТП сервер"
+
+# >> @item
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "ресурс Аконадија"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Тип транспорта"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Име домаћина сервера"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Име домаћина или бројевна адреса СМТП сервера."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Броја порта на серверу"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "Број порта на којем СМТП сервер ослушкује. Подразумевани је 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Корисничко име за пријаву"
+
+# >! authorization -> authentication
+# rewrite-msgid: /authorization/authentication/
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Корисничко име које се шаље серверу ради аутентификације."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Наредба пре слања поште"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Наредба која се извршава локално пре слања е‑поште. На пример, може "
+"послужити за отварање ССХ тунела. Ако оставите празно, ништа се не извршава."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Сервер захтева аутентификацију"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Попуните ако СМТП сервер захтева аутентификацију да би прихватио пошту. "
+"Познато ако „аутентификовани СМТП“ или краће АСМТП."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Смести лозинку"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Попуните ако желите да се лозинка смешта. Ако је К‑новчаник на располагању, "
+"смештање лозинке сматра се безбедним. У супротном, лозинка се смешта у "
+"поставни фајл, у замагљеном облику. Ово, међутим, не треба сматрати "
+"безбедним од покушаја дешифровања ако се неко домогне поставног фајла."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Начин шифровања за комуникацију"
+
+# >> @item
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "без шифровања"
+
+# >> @item
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "ССЛ шифровање"
+
+# >> @item
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "ТЛС шифровање"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Начин аутентификације"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- УРАДИ -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Укључите ако желите посебно име домаћина за идентификацију на серверу поште. "
+"Корисно када име домаћина на локалном систему није исправно постављено, или "
+"да се замаскира право име."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Име домаћина које се шаље серверу при идентификацији."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Укључите ако желите посебну адресу пошиљаоца за идентификацију на серверу "
+"поште. У супротном, користи се адреса из идентитета."
+
+# rewrite-msgid: /overwrite/replace/
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr "Адреса којом се замењује подразумевана адреса пошиљаоца."
+
+# >> @title
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Извршавање преднаредбе"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Извршавам преднаредбу <icode>%1</icode>."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Не могу да извршим преднаредбу <icode>%1</icode>."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Грешка при извршавању преднаредбе <icode>%1</icode>."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Преднаредба се срушила."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Преднаредба је изашла с кодом %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr "Морате задати корисничко име и лозинку за овај СМТП сервер."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Не могу да створим СМТП посао."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+# >> @item
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "чисти текст"
+
+# >> @item
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "анонимно"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "непознат"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"К‑новчаник није на располагању. Врло је препоручљиво да користите К‑новчаник "
+"за управљање лозинкама.\n"
+"Лозинка ипак може бити смештена у поставни фајл, у замагљеном облику. Ово, "
+"међутим, не треба сматрати безбедним од покушаја дешифровања ако се неко "
+"домогне поставног фајла.\n"
+"Желите ли заиста да сместите лозинку за сервер „%1“ у поставни фајл?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "Нема К‑новчаника"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Смести лозинку"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Не смештај лозинку"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Одлазни налог „%1“ није исправно подешен."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "подразумевани транспорт"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Пре слања морате направити одлазни налог."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Направити налог сада?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Направи налог сада"
+
+# >> @title:window
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Подешавање налога"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "СМТП"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "СМТП сервер на Интернету"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"За следеће транспорте поште лозинка се држи у поставном фајлу. Из "
+"безбедносних разлога, размислите да преселите ове лозинке у К‑новчаник, "
+"КДЕ‑ову алатку за управљање новчаницима, где се подаци чувају у снажно "
+"шифрованом фајлу.\n"
+"Желите ли да преселите лозинке у К‑новчаник?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Питање"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Пресели"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Задржи"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Први корак: избор типа транспорта"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Име:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Као подразумевани одлазни налог"
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Изаберите тип налога са доњег списка:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "тип"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "опис"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Опште"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Подаци налога"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "&Сервер одлазне поште:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Пријава:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "&Лозинка:"
+
+# >! authorization -> authentication
+# rewrite-msgid: /authorization/authentication/
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Лозинка која се шаље серверу ради аутентификације."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Смести СМТП лозинку"
+
+# >> @option:check
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Сервер &захтева аутентификацију"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Напредно"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Поставке повезивања"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Аутоматски откриј"
+
+# >> @label
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Сервер не подржава аутентификацију"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Шифровање:"
+
+# >> @option:radio
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&никакво"
+
+# >> @option:radio
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&ССЛ"
+
+# >> @option:radio
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&ТЛС"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Порт:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Аутентификација:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Поставке СМТП‑а"
+
+# >> @option:check
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Шаљи серверу &посебно име домаћина"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "Име &домаћина:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Посебна адреса пошиљаоца"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Адреса пошиљаоца:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Преднаредба:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Уклони"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "&Ово је подразумевано"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "&Додај..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Преименуј"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Измени..."
+
+# >> @title:window
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Стварање одлазног налога"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Направи и подеси"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Не могу да проверим способности. Проверите порт и режим аутентификације."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Провера способности пропала"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Овај одлазни налог не може да се подеси."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "име"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "тип"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (подразумевани)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Желите ли да уклоните одлазни налог „%1“?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Уклонити одлазни налог?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Додај..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Измени..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Преименуј"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Уклони"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Ово је подразумевано"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Празна порука."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Порука нема прималаца."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Порука има лош транспорт."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Порука има лошу фасциклу послатог."
diff -Nru kmailtransport-16.12.3/po/sv/docs/kioslave5/smtp/CMakeLists.txt kmailtransport-17.04.3/po/sv/docs/kioslave5/smtp/CMakeLists.txt
--- kmailtransport-16.12.3/po/sv/docs/kioslave5/smtp/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/sv/docs/kioslave5/smtp/CMakeLists.txt	2017-07-11 00:26:21.000000000 +0000
@@ -0,0 +1 @@
+kdoctools_create_handbook(index.docbook INSTALL_DESTINATION ${HTML_INSTALL_DIR}/${CURRENT_LANG}/ SUBDIR kioslave5/smtp )
diff -Nru kmailtransport-16.12.3/po/sv/docs/kioslave5/smtp/index.docbook kmailtransport-17.04.3/po/sv/docs/kioslave5/smtp/index.docbook
--- kmailtransport-16.12.3/po/sv/docs/kioslave5/smtp/index.docbook	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/sv/docs/kioslave5/smtp/index.docbook	2017-07-11 00:26:21.000000000 +0000
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
+<!ENTITY % addindex "IGNORE">
+<!ENTITY % Swedish "INCLUDE"
+> <!-- change language only here -->
+]>
+	
+<article lang="&language;" id="smtp">
+<title
+>smtp</title>
+<articleinfo>
+<authorgroup>
+<author
+>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"
+> <firstname
+>Stefan</firstname
+> <surname
+>Asserhäll</surname
+> <affiliation
+><address
+><email
+>stefan.asserhall@bredband.net</email
+></address
+></affiliation
+> <contrib
+>Översättare</contrib
+></othercredit
+> 
+</authorgroup>
+</articleinfo>
+<para
+>Ett protokoll för att skicka e-post från klientens arbetsstation till e-postservern. </para>
+
+<para
+>Se: <ulink url="http://cr.yp.to/smtp.html"
+>Simple Mail Transfer Protocol </ulink
+>. </para>
+
+</article>
diff -Nru kmailtransport-16.12.3/po/sv/kio_smtp.po kmailtransport-17.04.3/po/sv/kio_smtp.po
--- kmailtransport-16.12.3/po/sv/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/sv/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,231 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Stefan Asserhäll <stefan.asserhall@bredband.net>, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-04-04 20:16+0100\n"
+"Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
+"Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Generator: Lokalize 2.0\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Servern avvisade både kommandot EHLO och HELO som okända eller inte "
+"implementerade.\n"
+"Kontakta serverns systemadministratör."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Oväntat svar från servern för kommandot %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Din SMTP-server stöder inte TLS. Stäng av TLS om du vill ansluta utan "
+"kryptering."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Din SMTP-server påstår att den stöder TLS men förhandlingen lyckades inte.\n"
+"Du kan stänga av TLS i inställningsmodulen för SMTP-konton."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Anslutning misslyckades"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Ett fel uppstod under behörighetskontroll: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Ingen information för behörighetskontroll angiven."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Välj en annan metod för behörighetskontroll."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Din SMTP-server stöder inte %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr ""
+"Din SMTP-server stöder inte (ospecificerad metod för behörighetskontroll)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Din SMTP-server stöder inte behörighetskontroll.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Behörighetskontroll misslyckades.\n"
+"Troligen är lösenordet felaktigt.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Kunde inte läsa data från programmet."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Brevets innehåll accepterades inte.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Servern svarade:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Servern svarade: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Det här är ett tillfälligt fel. Du kan försöka igen senare."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Programmet skickade en felaktig begäran."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Avsändaradressen saknas."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTP-protokoll::smtp_open misslyckades (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Servern (%1) stöder inte att skicka 8-bitarsbrev.\n"
+"Använd kodningen base64 eller quoted-printable."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Misslyckades skriva till uttag."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Ogiltigt SMTP-svar (%1) mottaget."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Servern (%1) accepterade inte anslutningen.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Användarnamn och lösenord för ditt SMTP-konto:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Servern accepterade inte en tom avsändaradress.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Servern accepterade inte avsändaradressen \"%1\".\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Misslyckades skicka brevet eftersom följande mottagare avvisades av "
+"servern:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Försöket att börja skicka brevets innehåll misslyckades.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Ohanterat feltillstånd. Skicka en felrapport."
diff -Nru kmailtransport-16.12.3/po/sv/libmailtransport5.po kmailtransport-17.04.3/po/sv/libmailtransport5.po
--- kmailtransport-16.12.3/po/sv/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/sv/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,813 @@
+# translation of libmailtransport.po to Swedish
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Stefan Asserhäll <stefan.asserhall@bredband.net>, 2007, 2008, 2009, 2010, 2012, 2013, 2014, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-03-15 17:26+0100\n"
+"Last-Translator: Stefan Asserhäll <stefan.asserhall@bredband.net>\n"
+"Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
+"Language: sv\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 2.0\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Unik identifierare"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Överföringsnamn synligt för användare"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Namnet som kommer att användas för att referera till servern."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Namnlös"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP-server"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi-resurs"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Överföringstyp"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Serverns värddatornamn"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Domännamnet eller den numeriska adressen för SMTP-servern."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Serverns portnummer"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "Portnumret som SMTP-servern lyssnar på. Standardporten är 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Användarnamn som behövs för inloggning"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Användarnamn att skicka till servern för behörighetskontroll."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Kommando att köra innan ett brev skickas"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Ett kommado att köra lokalt innan brev skickas. Det kan till exempel "
+"användas för att ställa in en SSH-tunnel. Lämna det tomt om inget kommando "
+"ska köras.      "
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Servern kräver identifiering"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Markera alternativet om SMTP-servern kräver behörighetskontroll innan brev "
+"accepteras. Detta är känt som 'Behörighetskontrollerad SMTP' eller "
+"ASMTP.      "
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Lagra lösenord"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Markera alternativet för att lagra ditt lösenord.\n"
+"Om plånboken är tillgänglig lagras lösenorden där, vilket anses vara "
+"säkert.\n"
+"Dock lagras lösenorden i inställningsfilen om plånboken inte är tillgänglig. "
+"Lösenordet lagras med ett fördunklat format, men kan inte anses säkert för "
+"dekrypteringsförsök om åtkomst till konfigurationsfilen erhålls."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Krypteringsmetod använd för kommunikation"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Ingen kryptering"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL-kryptering"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS-kryptering"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Behörighetskontrollmetod"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- ATT GÖRA -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Markera alternativet för att använda ett eget värddatornamn vid "
+"identifiering på e-postservern. Det är användbart när systemets "
+"värddatornamn kanske inte är riktigt inställt, eller för att maskera "
+"systemets verkliga värddatornamn."
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Ange värddatornamn som ska användas vid identifikation på servern."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Markera alternativet för att använda en egen avsändaradress vid "
+"identifiering på e-postservern. Om det inte är markerat, används adressen "
+"från identiteten."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Ange adressen som ska användas för att skriva över standardavsändaradressen."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Kör förkommando"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Kör förkommando '%1'."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Kunde inte starta förkommandot \"%1\"."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Fel vid körning av förkommandot '%1'."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Förkommandot kraschade."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Förkommandot avslutades med koden %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Du måste ange ett användarnamn och ett lösenord för att använda den här SMTP-"
+"servern."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Kunde inte skapa SMTP-jobb."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 - %2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Klartext"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anonym"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Okänd"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"Plånboken är inte tillgänglig. Du rekommenderas starkt att använda plånboken "
+"för att hantera lösenord.\n"
+"Dock kan lösenorden istället lagras i inställningsfilen. Lösenordet lagras "
+"med ett fördunklat format, men kan inte anses säkert för dekrypteringsförsök "
+"om åtkomst till konfigurationsfilen erhålls.\n"
+"Vill du lagra lösenordet till servern '%1' i inställningsfilen?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "Kwallet inte tillgänglig"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Lagra lösenord"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Lagra inte lösenord"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Utgående kontot \"%1\" är inte riktigt inställt."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Förvald överföring"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Du måste skapa ett utgående konto innan du skickar någonting."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Skapa konto nu?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Skapa konto nu"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Anpassa konto"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "En SMTP-server på Internet"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Följande brevöverföringar lagrar sina lösenord i en okrypterad "
+"inställningsfil.\n"
+"Av säkerhetsskäl rekommenderas att använda flytta dessa lösenord till "
+"plånboken, KDE:s hanteringsverktyg för att lagra lösenord, Kwallet,\n"
+"som lagrar känslig data åt dig i en säkert krypterad fil.\n"
+"Vill du flytta lösenorden till plånboken?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Fråga"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Flytta"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Behåll"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Steg ett: Välj överföringstyp"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Namn:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Gör det här utgående standardkonto."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Välj en kontotyp i listan nedan."
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Typ"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Beskrivning"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Allmänt"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Kontoinformation"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Server för utgående &brev:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "Användarna&mn:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "&Lösenord:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Lösenord att skicka till servern för behörighetskontroll."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&Lagra SMTP-lösenord"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Servern k&räver behörighetskontroll"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Avancerat"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Anslutningsinställningar"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Detektera automatiskt"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Servern stöder inte behörighetskontroll"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Kryptering:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "I&ngen"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Behörighetskontroll:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP-inställningar"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Skicka eget värd&datornamn till servern"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "Värddatorna&mn:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Använ egen avsändaradress"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Avsändaradress:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Förkommando:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "Ta &bort"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Använd som &standardvärde"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "&Lägg till..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Byt namn"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Ändra..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Skapa utgående konto"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Skapa och anpassa"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Misslyckades kontrollera funktionalitet. Verifiera port och inställningen av "
+"behörighetskontroll."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Misslyckades kontrollera funktionalitet"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Utgående konto kan inte ställas in."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Namn"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Typ"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Förval)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Vill du ta bort utgående kontot '%1'?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Ta bort utgående konto?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Lägg till..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Ändra..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Byt namn"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Ta bort"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Använd som standardvärde"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Tomt brev."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Brevet har inga mottagare."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Brevet har ogiltig överföring."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Brevet har ogiltig korg för skickade brev."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "&Värddatornamn:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Lokal sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Kan inte starta mailerprogrammet %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail avslutades onormalt."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail avslutades onormalt: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "En lokal installation av sendmail"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "SSendmails p&lats:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "Post&server:"
+
+#~ msgid "Edit..."
+#~ msgstr "Redigera..."
+
+#~ msgid "text"
+#~ msgstr "text"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "Kontrollera &vad servern stödjer"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Behörighetskontrollmetod"
+
+#~ msgid "&LOGIN"
+#~ msgstr "&LOGIN"
+
+#~ msgid "&PLAIN"
+#~ msgstr "&PLAIN"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "&GSSAPI"
+
+#~ msgid "&NTLM"
+#~ msgstr "&NTLM"
+
+#~ msgid "Message has invalid due date."
+#~ msgstr "Brevet har felaktigt färdigdatum."
+
+#~ msgid "Transport: Sendmail"
+#~ msgstr "Brevöverföring: Sendmail"
+
+#~ msgid "&Location:"
+#~ msgstr "&Plats:"
+
+#~ msgid "Choos&e..."
+#~ msgstr "V&älj..."
+
+#~ msgid "Transport: SMTP"
+#~ msgstr "Brevöverföring: SMTP"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "Use Sendmail"
+#~ msgstr "Använd Sendmail"
+
+#~ msgid "Only local files allowed."
+#~ msgstr "Endast lokala filer är tillåtna."
+
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "Lägg till brevöverföring"
+
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "Ändra brevöverföring"
diff -Nru kmailtransport-16.12.3/po/tr/kio_smtp.po kmailtransport-17.04.3/po/tr/kio_smtp.po
--- kmailtransport-16.12.3/po/tr/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/tr/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,236 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# Görkem Çetin <gorkem@kde.org>, 2003.
+# H. İbrahim Güngör <ibrahim@pardus.org.tr>, 2011.
+# obsoleteman <tulliana@gmail.com>, 2008-2009.
+# Kaan Ozdincer <kaanozdincer@gmail.com>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: kdepimlibs-kde4\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2014-11-12 01:06+0200\n"
+"Last-Translator: Kaan Ozdincer <kaanozdincer@gmail.com>\n"
+"Language-Team: Turkish <kde-l10n-tr@kde.org>\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Lokalize 1.4\n"
+"(http: //www.transifex.com/projects/p/kdepimlibs-k-tr/language/tr/)\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Sunucu EHLO ve HELO komutlarını bilinmeyen ya da henüz eklenmemiş komutlar "
+"olarak reddetti.\n"
+"Lütfen sunucunuzun sistem yöneticisine başvurun."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"%1 komutuna bilinmeyen sunucu cevabı.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"SMTP sunucunuz TLS desteklemiyor. Şifresiz bağlantı kurmak istiyorsanız "
+"TLS'i iptal edin."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Kullandığınız SMTP sunucusu TLS desteklediğini bildiriyor ancak bağlantı "
+"başarısız oldu.\n"
+"SMTP hesap ayarları penceresinden TLS'yi kapatabilirsiniz."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Bağlantı Başarısız Oldu"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Kimlik doğrulama işlemi sırasında bir hata oluştu: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Kimlik doğrulama ayrıntısı sağlanmadı."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Farklı bir kimlik sınama yöntemi seçin."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "SMTP sunucunuz %1 desteklemiyor."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "SMTP sunucunuz desteklemiyor (belirtilmemiş yöntem)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"SMTP sunucunuz kimlik sınamayı desteklemiyor.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Kimlik sınamada hata oluştu.\n"
+"Parola geçersiz olabilir.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Uygulamadan veri okunamadı."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Mesajın içeriği kabul edilmedi.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Sunucu cevabı: \n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Sunucu cevabı: \"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Bu geçici bir hatadır. Daha sonra tekrar deneyiniz."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Uygulama geçersiz bir istek gönderdi."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Gönderici adres eksik."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open hata verdi (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Sunucunuz (%1) 8-bit mesajların iletilmesini desteklemiyor.\n"
+"Lütfen base64 ya da okunabilir bir kodlama kullanın."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Sokete yazma işlemi başarısız oldu."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Geçersiz SMTP cevabı (%1) alındı."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Sunucu (%1) bağlantıyı kabul etmedi: \n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "SMTP hesabınız için kullanıcı adı ve parolanız:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Sunucu, gönderenin boş adresini kabul etmedi:\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Sunucu, gönderenin adresini kabul etmedi (%1)\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Bu alıcılar sunucu tarafından reddedildiğinden ileti gönderme işlemi "
+"başarısız oldu:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"İletinin içeriğini gönderme işlemi başarısız oldu.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Bir hata alındı. Lütfen hata raporu hazırlayıp gönderin."
diff -Nru kmailtransport-16.12.3/po/tr/libmailtransport5.po kmailtransport-17.04.3/po/tr/libmailtransport5.po
--- kmailtransport-16.12.3/po/tr/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/tr/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,757 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Translators:
+# H. İbrahim Güngör <h.ibrahim.gungor@gmail.com>, 2009.
+# H. İbrahim Güngör <ibrahim@pardus.org.tr>, 2011.
+# obsoleteman <tulliana@gmail.com>, 2008-2009,2012.
+# Volkan Gezer <volkangezer@gmail.com>, 2013-2014.
+# Kaan Ozdincer <kaanozdincer@gmail.com>, 2014.
+msgid ""
+msgstr ""
+"Project-Id-Version: kdepimlibs-kde4\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2017-06-29 08:42+0000\n"
+"Last-Translator: Kaan <kaanozdincer@gmail.com>\n"
+"Language-Team: Turkish <kde-l10n-tr@kde.org>\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Lokalize 1.4\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Biricik tanımlayıcı"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Kullanıcıya görünen aktarım adı"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Bu sunucuyla iletişim kurulurken kullanılacak isim."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "İsimsiz"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP Sunucu"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi Kaynağı"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Aktarım türü"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Sunucunun makine adı"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "SMTP sunucusunun alan adı ya da ip adresi."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Sunucunun port numarası"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "SMTP sunucusunun dinlediği port numarası. Öntanımlı port 25'tir."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Giriş için gereken kullanıcı adı"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Kimlik doğrulama işlemi için sunucuya gönderilecek kullanıcı adı."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Bir e-posta gönderilmeden önce çalıştırılacak komut"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"E-posta gönderilmeden önce yerel olarak çalıştırılacak komut. Bu, örneğin "
+"SSH tünellerini ayarlamak için kullanılabilir. Eğer bir komut çalıştırılması "
+"gerekmiyorsa, boş bırakın."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Sunucu kimlik doğrulaması gerektiriyor"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Eğer SMTP sunucunuz posta kabulünden önce kimlik doğrulama gerektiriyorsa bu "
+"seçeneği işaretleyin. Bu 'Doğrulanmış SMTP - Authenticated SMTP' veya kısaca "
+"ASMTP olarak bilinir."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Parolayı kaydet"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Parolalarınızın depolanmasını istiyorsanız bu seçeneği işaretleyin.\n"
+"Eğer KWallet kullanılabilirse, parolalarınız güvenli olarak düşünülen "
+"KWallet içerisine kaydedilecektir.\n"
+"Bununla birlikte KWallet yoksa, parolanız yapılandırma dosyasına "
+"kaydedilecek. Parolalar karıştırılmış şekilde kaydedilir ancak yapılandırma "
+"dosyanız birisinin eline geçerse parolanızın şifrelemesinin çözülemeyeceğini "
+"düşünmeyin."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "İletişim için kullanılan şifreleme yöntemi"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Şifreleme yok"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL şifrelemesi"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS şifrelemesi"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Kimlik doğrulama yöntemi"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- YAPILACAK -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"E-posta sunucusunu tanımlamak için özel bir makine adı kullanmak "
+"istiyorsanız bu seçeneği işaretleyin. Bu seçenek, sistemin makine adının "
+"doğru bir şekilde ayarlanmadığı durumlarda ya da makinenizin makine adının "
+"maskelendiği durumlarda kullanışlıdır.     "
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "Sunucu kimliği belirlenirken kullanılacak makine adını girin."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"E-posta sunucusunu tanımlamak için özel bir gönderici adresi kullanmak "
+"istiyorsanız bu seçeneği işaretleyin. İşaretli değilse, kimlikteki adres "
+"kullanılacaktır."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr "Öntanımlı gönderen adresinin yerine kullanılacak adresi girin."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Ön komut çalıştırılıyor"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "'%1' ön komutu çalıştırılıyor."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "'%1' ön komutu çalıştırılamadı."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "'%1' ön komutu çalıştırılırken bir hata oluştu."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Ön komut çöktü."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Ön komuttan '%1' kodu ile çıkıldı."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Bu SMTP sunucusunu kullanmak için bir kullanıcı adı ve parola sağlamanız "
+"gerekiyor."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "SMTP görevi oluşturulamadı."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Metni temizle"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Anonim"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Bilinmeyen"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet kullanılabilir durumda değil. Parolalarınızı yönetmek için KWallet "
+"kullanmanız şiddetle tavsiye edilir.\n"
+"Bununla birlikte parolanız yapılandırma dosyasına da kaydedilebilir. "
+"Parolalar karıştırılmış şekilde kaydedilir ancak yapılandırma dosyanız "
+"birisinin eline geçerse parolanızın şifrelemesinin çözülemeyeceğini "
+"düşünmeyin.\n"
+"'%1' sunucusu için parolanızı yapılandırma dosyasında saklamak istiyor "
+"musunuz?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet Kullanılabilir Değil"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Parolayı Kaydet"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Parolayı Kaydetme"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "\"%1\" giden hesabı, doğru bir şekilde yapılandırılmamış."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Öntanımlı Aktarım"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Göndermeden önce bir giden e-posta hesabı oluşturmalısınız."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Şimdi Yeni Hesap Oluşturulsun mu?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Şimdi Yeni Hesap Oluştur"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Hesabı yapılandır"
+
+#: kmailtransport/transportmanager.cpp:472
+#, fuzzy, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "İnternet'teki bir SMTP sunucusu"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Aşağıdaki posta gönderim parolaları şifrelenmemiş bir yapılandırma dosyasına "
+"kaydedilecek.\n"
+"Güvenlik nedeniyle hassas verilerinizi güçlü bir şekilde şifrelenmiş "
+"dosyalarda saklayan,\n"
+"KDE Cüzdan Yönetim aracı KWallet içerisine taşımaya dikkat edin.\n"
+"Parolalarınızı KWallet içerisine taşımak istiyor musunuz?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Soru"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Taşı"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Koru"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Adım Bir: Aktarım Türünü Seçin"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "İsim:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Bunu öntanımlı giden hesabı yap."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Aşağıdaki listeden bir hesap türü seçin:"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Tür"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Açıklama"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Genel"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Hesap Bilgisi"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Giden e-&posta sunucusu:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Kullanıcı adı:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "&Parola:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Parola kimlik doğrulama işlemi için sunucuya gönderildi."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "&SMTP parolasını sakla"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Sunucu kimlik &doğrulama gerektiriyor"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Gelişmiş"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Bağlantı Ayarları"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Otomatik Algıla"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Bu sunucu kimlik doğrulamayı desteklemiyor"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Şifreleme:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Hiçbiri"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Port:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Kimlik doğrulama yöntemi:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP Ayarları"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Sunucuya özel bir makine &adı gönder"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "Maki&ne adı:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Özel gönderen adresi kullan"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Gönderen Adresi:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Ön komut:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "&Sil"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "Ö&ntanımlı Olarak Ayarla"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "&Ekle..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "&Yeniden Adlandır"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Düzenle..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Giden Hesabı Oluştur"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Oluştur ve Yapılandır"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Yeteneklerin kontrolü başarısız oldu. Lütfen portu ve kimlik kantıtlama "
+"kipini onaylayın."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Yeteneklerin Kontrolü Başarısız"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Bu bir giden hesap ve yapılandırılamaz."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "İsim"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Tür"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Öntanımlı)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "'%1' giden hesabını kaldırmak istiyor musunuz?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Giden e-posta hesabı kaldırılsın mı?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Ekle..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Değiştir..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Yeniden Adlandır"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Kaldır"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Öntanımlı Olarak Ayarla"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Boş ileti."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "İletinin alıcısı yok."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "İletinin aktarımı geçersiz."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "İletinin gönderilmiş-e-posta dizini geçersiz."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "Ma&kine adı:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Yerel sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "%1 e-posta gönderme uygulaması çalıştırılamadı"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail uygulamasından normal olmayan şekilde çıkıldı."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail uygulamasından normal olmayan şekilde çıkıldı: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Yerel sendmail kurulumu"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Sendmail &Konumu:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "Posta &sunucu:"
diff -Nru kmailtransport-16.12.3/po/ug/kio_smtp.po kmailtransport-17.04.3/po/ug/kio_smtp.po
--- kmailtransport-16.12.3/po/ug/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ug/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,202 @@
+# Uyghur translation for kio_smtp.
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+# Sahran <sahran.ug@gmail.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2013-09-08 07:05+0900\n"
+"Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
+"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
+"Language: ug\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "باغلىنىش مەغلۇپ بولدى"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "كىملىك دەلىللەۋاتقاندا خاتالىق كۆرۈلدى: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "كىملىك دەلىللەش تەپسىلاتى تەمىنلەنمىگەن."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr ""
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr ""
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr ""
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr ""
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr ""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr ""
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr ""
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr ""
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr ""
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr ""
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr ""
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr ""
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr ""
diff -Nru kmailtransport-16.12.3/po/ug/libmailtransport5.po kmailtransport-17.04.3/po/ug/libmailtransport5.po
--- kmailtransport-16.12.3/po/ug/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/ug/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,693 @@
+# Uyghur translation for libmailtransport.
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+# Sahran <sahran.ug@gmail.com>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2013-09-08 07:05+0900\n"
+"Last-Translator: Gheyret Kenji <gheyret@gmail.com>\n"
+"Language-Team: Uyghur Computer Science Association <UKIJ@yahoogroups.com>\n"
+"Language: ug\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr ""
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr ""
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "ئاتسىز"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP مۇلازىمېتىر"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi مەنبەسى"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr ""
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr ""
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr ""
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr ""
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "مۇلازىمېتىر كىملىك دەلىللىشى كېرەك"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "ئىم ساقلا"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr ""
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "شىفىرلاش يوق"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL شىفىرلاش"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS شىفىرلاش"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr ""
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr ""
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr ""
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr ""
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "تېكىستنى تازىلا"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "ئاتسىز"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "نامەلۇم"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet نى ئىشلەتكىلى بولمايدۇ"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "ئىم ساقلاش"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "ئىمنى ساقلىما"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "سوئال"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "يۆتكە"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "تەگمە"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "ئاتى:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "تىپى"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "چۈشەندۈرۈش"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "ئادەتتىكى"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "ھېساب ئۇچۇرى"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "كىرىش(&L):"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "ئىم(&A):"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr ""
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "ئالىي"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "باغلىنىش تەڭشىكى"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "ئۆزلۈكىدىن بايقا"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "شىفىرلاش:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "يوق(&N)"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "ئېغىز(&P):"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "كىملىك دەلىللەش:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr ""
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "چىقىرىۋەت(&V)"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "كۆڭۈلدىكى قىلىپ بەلگىلە(&S)"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "قوش(&D)…"
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "ئات ئۆزگەرت(&R)"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "ئۆزگەرت(&M)..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Create Outgoing Account"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr ""
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr ""
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "ئاتى"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "تىپى"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (كۆڭۈلدىكى)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr ""
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "قوش…"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "ئۆزگەرت…"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "ئات ئۆزگەرت"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "چىقىرىۋەت"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "كۆڭۈلدىكى قىلىپ بەلگىلە"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr ""
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr ""
+
+#~ msgid "Hos&tname:"
+#~ msgstr "كومپيۇتېر ئاتى(&T):"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
diff -Nru kmailtransport-16.12.3/po/uk/docs/kioslave5/smtp/index.docbook kmailtransport-17.04.3/po/uk/docs/kioslave5/smtp/index.docbook
--- kmailtransport-16.12.3/po/uk/docs/kioslave5/smtp/index.docbook	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/uk/docs/kioslave5/smtp/index.docbook	2017-07-11 00:26:21.000000000 +0000
@@ -0,0 +1,41 @@
+<?xml version="1.0" ?>
+<!DOCTYPE article PUBLIC "-//KDE//DTD DocBook XML V4.5-Based Variant V1.1//EN"
+"dtd/kdedbx45.dtd" [
+<!ENTITY % addindex "IGNORE">
+<!ENTITY % Ukrainian "INCLUDE"
+> <!-- change language only here -->
+]>
+	
+<article lang="&language;" id="smtp">
+<title
+>smtp</title>
+<articleinfo>
+<authorgroup>
+<author
+>&Ferdinand.Gassauer; &Ferdinand.Gassauer.mail;</author>
+<othercredit role="translator"
+><firstname
+>Юрій</firstname
+><surname
+>Чорноіван</surname
+><affiliation
+><address
+><email
+>yurchor@ukr.net</email
+></address
+></affiliation
+><contrib
+>Переклад українською</contrib
+></othercredit
+> 
+</authorgroup>
+</articleinfo>
+<para
+>Протокол для надсилання пошти з робочої станції клієнта на поштовий сервер. </para>
+
+<para
+>Перегляньте статтю за цим посиланням: <ulink url="http://cr.yp.to/smtp.html"
+>Simple Mail Transfer Protocol </ulink
+>. </para>
+
+</article>
diff -Nru kmailtransport-16.12.3/po/uk/kio_smtp.po kmailtransport-17.04.3/po/uk/kio_smtp.po
--- kmailtransport-16.12.3/po/uk/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/uk/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,234 @@
+# Translation of kio_smtp.po to Ukrainian
+# Copyright (C) 2016 This_file_is_part_of_KDE
+# This file is distributed under the license LGPL version 2.1 or
+# version 3 or later versions approved by the membership of KDE e.V.
+#
+# Yuri Chornoivan <yurchor@ukr.net>, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-04-04 17:41+0300\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"X-Generator: Lokalize 1.5\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"Сервер відмовив командам EHLO та HELO, як невідомим або невпровадженим.\n"
+"Будь ласка, зверніться до системного адміністратора."
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"Непередбачена відповідь на команду %1.\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"Ваш сервер не підтримує TLS. Вимкніть TLS, якщо ви хочете приєднатися без "
+"підтримки криптографії."
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"Ваш сервер SMTP стверджує, що підтримує TLS, але виникли помилки "
+"узгодження.\n"
+"Ви можете вимкнути TLS за допомогою діалогового вікна налаштування "
+"облікового запису SMTP."
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "Невдала спроба з’єднання"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "Сталася помилка під час розпізнавання: %1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "Не надано інформації для розпізнавання."
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "Вибрати інший метод автентифікації."
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "Ваш сервер SMTP не підтримує %1."
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "Ваш сервер SMTP не підтримує (невизначений метод)."
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"Ваш сервер SMTP не підтримує автентифікацію.\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"Помилка автентифікації.\n"
+"Скоріше за все, пароль було задано невірно.\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "Неможливо отримати дані з програми."
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"Зміст повідомлення не сприйнято.\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"Сервер відповів:\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "Сервер відповів: «%1»"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "Це тимчасова помилка. Ви можете повторити спробу пізніше."
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "Програма відіслала невірний запит."
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "Адреса відправника відсутня."
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "Помилка протоколу SMTPProtocol::smtp_open (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"Ваш сервер (%1) не підтримує відправлення 8-бітових повідомлень.\n"
+"Будь ласка, скористайтеся кодуванням base64 або quoted-printable."
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "Помилка запису до сокету."
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "Отримано невірну відповідь SMTP (%1)."
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"Сервер (%1) не прийняв з'єднання.\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "Ім'я та пароль вашого облікового запису SMTP:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"Сервер не прийняв порожню адресу відправника.\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"Сервер не прийняв адресу відправника «%1».\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"Відсилання повідомлення зазнало невдачі, оскільки адресати були відкинуті "
+"сервером:\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"Помилка спроби відіслати зміст повідомлення.\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "Нетипова помилка. Будь ласка, надішліть звіт про помилку."
diff -Nru kmailtransport-16.12.3/po/uk/libmailtransport5.po kmailtransport-17.04.3/po/uk/libmailtransport5.po
--- kmailtransport-16.12.3/po/uk/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/uk/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,818 @@
+# Translation of libmailtransport5.po to Ukrainian
+# Copyright (C) 2014-2016 This_file_is_part_of_KDE
+# This file is distributed under the license LGPL version 2.1 or
+# version 3 or later versions approved by the membership of KDE e.V.
+#
+# Ivan Petrouchtchak <fr.ivan@ukrainian-orthodox.org>, 2007, 2008.
+# Yuri Chornoivan <yurchor@ukr.net>, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2016.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport5\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2016-03-15 22:14+0200\n"
+"Last-Translator: Yuri Chornoivan <yurchor@ukr.net>\n"
+"Language-Team: Ukrainian <kde-i18n-uk@kde.org>\n"
+"Language: uk\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
+"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "Унікальний ідентифікатор"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "Назва транспорту, видима для користувача"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "Назва, яка використовуватиметься для цього сервера."
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "Без назви"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "Сервер SMTP"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Ресурс Akonadi"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "Тип транспорту"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "Назва вузла сервера"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "Назва домену SMTP сервера або його числова адреса."
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "Номер порту сервера"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "Номер потру, який прослуховується SMTP сервером. Типове значення: 25."
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "Ім’я користувача для входу"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "Ім’я користувача, яке надсилатиметься до сервера для авторизації."
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "Команда, яку виконувати перед надсилання пошти"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"Команда, яку слід виконати локально перед надсиланням пошти. Це, наприклад, "
+"можна використати для встановлення SSH-тунелів. Залиште поле порожнім, якщо "
+"не слід виконувати жодних команд."
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "Сервер потребує авторизації"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"Позначте цей пункт, якщо ваш сервер SMTP потребує розпізнавання користувача "
+"перед прийманням пошти. Такі сервери відомі як «Authenticated SMTP» або "
+"просто ASMTP."
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "Зберегти пароль"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"Позначте цей пункт для збереження вашого пароля. Якщо доступна програма "
+"KWallet, пароль буде збережено за її допомогою, такий спосіб вважається "
+"безпечним. Але, якщо KWallet недоступна, пароль буде збережено у файлі "
+"налаштувань. Пароль зберігається у заплутаному вигляді, але, з міркувань "
+"часу, який слід витратити на дешифрування такого пароля, цей спосіб не можна "
+"вважати безпечним, якщо зловмисник отримає доступ до файла налаштувань."
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "Метод шифрування для зв’язку"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "Без шифрування"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "Шифрування SSL"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "Шифрування TLS"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "Метод автентифікації"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- ЗАВДАННЯ -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"Позначте цей пункт, щоб використовувати нетипову назву вузла під час "
+"ідентифікації на поштовому сервері. Це корисно, якщо системну назву вузла "
+"встановлено некоректно або щоб приховати справжню назву вузла вашої "
+"системи.      "
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr ""
+"Введіть назву вузла, яку слід використовувати для ідентифікації сервера."
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"Позначте цей пункт, щоб використовувати нетипову адресу відправника вузла "
+"під час ідентифікації на поштовому сервері. Якщо пункт не буде позначено, "
+"буде використано адресу профілю."
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr ""
+"Вкажіть адресу, яку слід використовувати замість типової адреси відправника."
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "Виконання передкоманди"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "Виконання передкоманди «%1»."
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "Не вдалося виконати передкоманду «%1»."
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "Помилка під час спроби виконання передкоманди «%1»."
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "Передкоманда зазнала краху."
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "Передкоманда вийшла з кодом %1."
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr ""
+"Ви повинні надати ім'я користувача та пароль для доступу до цього SMTP "
+"сервера."
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "Неможливо створити завдання SMTP."
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 №%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "Звичайний текстовий"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "Анонімний"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "Невідомий"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"Програма KWallet недоступна. Наполегливо рекомендуємо використовувати "
+"KWallet для керування вашими паролями.\n"
+"Тим не менше, паролі можна зберігати і у файлі налаштувань. Пароль "
+"зберігається у заплутаному вигляді, але, з міркувань часу, який слід "
+"витратити на дешифрування такого пароля, цей спосіб не можна вважати "
+"безпечним, якщо зловмисник отримає доступ до файла налаштувань.\n"
+"Чи бажаєте ви зберегти пароль до сервера «%1» у файлі налаштувань' in the "
+"configuration file?"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet недоступний"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "Зберігати пароль"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "Не зберігати пароль"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "Обліковий записи вихідної пошти «%1» налаштовано неправильно."
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "Типовий транспорт"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "Вам слід створити обліковий запис вихідної пошти перед надсиланням."
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "Створити запис зараз?"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "Створити запис зараз"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "Налаштування облікового запису"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "SMTP-сервер у інтернеті"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"Ці транспорти пошти зберігають пароль у файлі налаштувань, а не у KWallet.\n"
+"З міркувань безпеки, краще користуватися KWallet для зберігання паролів,\n"
+"ця програма зберігає конфіденційні дані у файлі зашифрованому сильним "
+"шифром.\n"
+"Чи бажаєте ви перенести ваші паролі до KWallet?"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "Питання"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "Мігрувати"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "Залишити"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "Крок 1. Оберіть спосіб пересилання"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "Назва:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "Зробити цей обліковий запис типовим для вихідної пошти."
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "Оберіть тип облікового запису з наведеного нижче списку"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "Тип"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "Опис"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "Загальні"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "Інформація щодо облікового запису"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "Сервер в&ихідної пошти:"
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "&Ім'я користувача:"
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "П&ароль:"
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "Пароль для надсилання до сервера для авторизації."
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "Збе&рігати пароль до SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "Сервер вимага&є автентифікації"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "Додаткові"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "Параметри з’єднання"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "Автовизначення"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "Цей сервер не підтримує автентифікації"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "Шифрування:"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "&Немає"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "&Порт:"
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "Розпізнавання:"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "Параметри SMTP"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "Відси&лати нетипову назву вузла на сервер"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "&Вузол:"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "Використовувати нетипову адресу відправника"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "Адреса відправника:"
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "Передкоманда:"
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "Ви&лучити"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "&Зробити типовим"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "&Додати…"
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "П&ерейменувати"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "&Змінити…"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "Створення облікового запису вихідної пошти"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "Створити і налаштувати"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr ""
+"Не вдалося визначити список можливостей. Будь ласка, перевірте, чи правильно "
+"вказано порт і режим розпізнавання."
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "Невдала спроба визначити можливості"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "Налаштовування цього облікового запису вихідної пошти неможливе."
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "Назва"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "Тип"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr " (Типовий)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "Бажаєте вилучити обліковий запис вихідної пошти «%1»?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "Вилучити обліковий запис вихідної пошти?"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "Додати…"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "Змінити…"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "Перейменувати"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "Вилучити"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "Зробити типовим"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "Порожнє повідомлення."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "Повідомлення не має отримувачів."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "Некоректний спосіб пересилання повідомлення."
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "Некоректна тека надісланих повідомлень для повідомлення."
+
+#~ msgid "Hos&tname:"
+#~ msgstr "На&зва вузла:"
+
+#~ msgid "Local sendmail"
+#~ msgstr "Локальна sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "Помилка виконання програми-поштаря %1"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Програма sendmail завершилась аварійно."
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Вихід Sendmail з помилкою: %1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "Локальна служба sendmail"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "&Адреса sendmail:"
+
+#~ msgid "Mail &server:"
+#~ msgstr "По&штовий сервер:"
+
+#~ msgid "Edit..."
+#~ msgstr "Змінити…"
+
+#~ msgid "text"
+#~ msgstr "текст"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "Перевірити, &які методи підтримуються сервером"
+
+#~ msgid "Authentication Method"
+#~ msgstr "Метод автентифікації"
+
+#~ msgid "&LOGIN"
+#~ msgstr "&LOGIN"
+
+#~ msgid "&PLAIN"
+#~ msgstr "&PLAIN"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD&5"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "&DIGEST-MD5"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "&GSSAPI"
+
+#~ msgid "&NTLM"
+#~ msgstr "&NTLM"
+
+#~ msgid "Message has invalid due date."
+#~ msgstr "Некоректна дата призначення повідомлення."
+
+#~ msgid "Transport: Sendmail"
+#~ msgstr "Відсилання пошти: Sendmail"
+
+#~ msgid "&Location:"
+#~ msgstr "&Адреса:"
+
+#~ msgid "Choos&e..."
+#~ msgstr "Ви&брати..."
+
+#~ msgid "Transport: SMTP"
+#~ msgstr "Відсилання пошти: SMTP"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "Use Sendmail"
+#~ msgstr "Використовувати Sendmail"
+
+#~ msgid "Only local files allowed."
+#~ msgstr "Дозволено тільки локальні файли."
+
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "Додати транспорт"
+
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "Змінити транспорт"
diff -Nru kmailtransport-16.12.3/po/zh_CN/kio_smtp.po kmailtransport-17.04.3/po/zh_CN/kio_smtp.po
--- kmailtransport-16.12.3/po/zh_CN/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/zh_CN/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,228 @@
+# Eric He <y2000_88@yahoo.com>, 2002
+# Funda Wang <fundawang@linux.net.cn>, 2002, 2004, 2007
+# Lie Ex <lilith.ex@gmail.com>, 2008, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2009-12-18 16:14+0800\n"
+"Last-Translator: Lie Ex <lilith.ex@gmail.com>\n"
+"Language-Team: zh_CN <kde-china@kde.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"服务器拒绝了 EHLO 和 HELO 命令，可能是未知或未实现。\n"
+"请联系服务器系统的管理员。"
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"服务器对 %1 命令的响应未预期。\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr "您的 SMTP 服务器不支持 TLS。如果您想不加密连接，请禁用 TLS。"
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"您的 SMTP 服务器声明支持 TLS，但协商失败了。您可以在 SMTP 账户设置对话框中禁"
+"用 TLS。"
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "连接失败"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "身份验证的过程中发生了错误：%1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "未提供身份验证细节。"
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "选择不同的验证方式。"
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "您的 SMTP 服务器不支持 %1。"
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "您的 SMTP 服务器不支持(未指定的方式)。"
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"您的 SMTP 服务器不支持身份验证。\n"
+"  %1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"身份验证失败。\n"
+"可能是密码错误。\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "无法从应用程序读取数据。"
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"消息内容不被接受。\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"服务器响应：\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "服务器响应：“%1”"
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "这是一个临时失败。您可以稍后再试。"
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "应用程序发送了无效的请求。"
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "缺少发件人地址。"
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open 失败(%1)。"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"您的服务器(%1)不支持发送 8 位的信件。\n"
+"请使用 base64 或 quoted-printable 编码。"
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "写入套接字失败。"
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "收到无效的 SMTP 响应(%1)。"
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"服务器(%1)不接受连接。\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "您 SMTP 账户的用户名和密码："
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"服务器不接受空发件人地址。\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"服务器不接受发件人地址“%1”。\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"信件发送失败，因为下列收件人被服务器拒绝：\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"尝试发送邮件内容失败。\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "无法处理的错误情况。请发送错误报告。"
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "身份验证支持没有编译进 kio_smtp。"
diff -Nru kmailtransport-16.12.3/po/zh_CN/libmailtransport5.po kmailtransport-17.04.3/po/zh_CN/libmailtransport5.po
--- kmailtransport-16.12.3/po/zh_CN/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/zh_CN/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,735 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Xuetian Weng <xweng@cs.stonybrook.edu>, 2014.
+# Weng Xuetian <wengxt@gmail.com>, 2015.
+# Guo Yunhe <guoyunhebrave@gmail.com>, 2017.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2017-01-13 18:40+0200\n"
+"Last-Translator: Guo Yunhe <guoyunhebrave@gmail.com>\n"
+"Language-Team: Chinese <kde-china@kde.org>\n"
+"Language: zh_CN\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Lokalize 2.0\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "唯一标识符"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "用户可见的传输名称"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "提交到此服务器时将使用的名称。"
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "未命名"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP 服务器"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi 资源"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "传送类型"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "服务器的主机名"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "SMTP 服务器的域名或数字地址。"
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "服务器的端口号码"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "SMTP 服务器监听的端口号码。默认端口是 25。"
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "登录所需的用户名"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "发送给服务器进行验证的用户名"
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "发送邮件前预先执行的命令"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"发送邮件前，在本地先运行的命令。例如，这里可用于设置 ssh 隧道。如果无需运行命"
+"令，请将此处留空。"
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "服务器需要认证"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"如果您的 SMTP 服务器在接受邮件前需要身份验证的话，请选中此选项。这被称为“需要"
+"验证的 SMTP”，或简称 ASMTP。"
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "存储密码"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"选中此选项后，KMail 将在其配置文件中存储密码。\n"
+"如果 KWallet 可用，那么密码将存储在钱包中，这样更加安全。\n"
+"但是，如果 KWallet 不可用，密码将存储在 KMail 的配置文件中。虽然该密码将以打"
+"乱的格式存储，但并不够安全，当获得配置文件访问权后被解密的可能性很大。"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "通讯所使用的加密方式"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "不加密"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL 加密"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS 加密"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "验证方式"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"选中此选项后，在向邮件服务器进行身份验证时会使用自定义主机名。如果您的系统主"
+"机名设置不正确，或者要隐藏真正的主机名，此选项将十分有用。"
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "输入用于向服务器进行身份识别时所使用的主机名。"
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"选中此选项后，在向邮件服务器进行身份验证时会使用自定义发件人地址。如果未选"
+"中，则使用身份中的地址。"
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr "输入用于覆盖默认发件人地址的地址。"
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "执行前置命令"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "执行前置命令“%1”。"
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "无法启动前置命令“%1”。"
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "执行前置命令“%1”时出错。"
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "前置命令崩溃。"
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "前置命令以代码 %1 退出。"
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr "您需要提供用户名和密码来使用这个 SMTP 服务器。"
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "无法创建 SMTP 任务。"
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "明文"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "匿名"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "未知"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"KWallet 不可用。强烈见您使用 KWallet 来管理您的密码。\n"
+"但是，KMail 也可以将密码保存在其配置文件中。虽然该密码将以打乱的格式存储，但"
+"并不够安全，当获得配置文件访问权后被解密的可能性很大。\n"
+"您是否想要在配置文件中存储服务器“%1”的密码？"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "KWallet 不可用"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "存储密码"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "不存储密码"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "对外账户“%1”尚未正确配置。"
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "默认传送"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "您在发送邮件前必需创建一个对外账户。"
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "现在就创建账户吗？"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "现在创建账户"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "配置账户"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "互联网上的 SMTP 服务器"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"下列邮件传送将密码存储在未经加密的配置文件中。\n"
+"为安全起见，推荐您使用 KDE 钱包管理工具 KWallet 对敏感数据进行强加密存储。\n"
+"您是否想要将您的密码迁移到 KWallet 中？"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "询问"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "迁移"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "保留"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "第一步：选择传输类型"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "名称："
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "设为默认对外账户。"
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "从下面的列表中选择一个账户类型："
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "类型"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "解密"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "常规"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "账户信息"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, kde-format
+msgid "Outgoing &mail server:"
+msgstr "外发邮件服务器(&M)："
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "登录名(&L)："
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "密码(&A)："
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "发送给服务器进行验证的密码。"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "存储 SMTP 密码(&S)"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "服务器需要认证(&R)"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "高级"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "连接设置"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "自动检测"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "此服务器不支持身份验证"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "加密："
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "无(&N)"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "&SSL"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "&TLS"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "端口(&P)："
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "验证方式："
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP 设置"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "向服务器发送自定义主机名(&D)"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, kde-format
+msgid "Hostna&me:"
+msgstr "主机名(&M)："
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "使用自定义发件人地址"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "发件人地址："
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "前置命令："
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "删除(&V)"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "设为默认(&S)"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "添加(&D)..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "重命名(&R)："
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "修改(&M)..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "创建对外账户"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "创建和配置"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr "检测能力失败。请检查端口和验证模式。"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "检测能力失败"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "此对外账户无法被配置。"
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "名称"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "类型"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr "(默认)"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "您想要删除对外账户“%1”吗？"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "删除对外账户吗？"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "添加..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "修改..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "重命名"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "删除"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "设置为默认"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "空信件。"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "信件没有收件人。"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "信件的传输方式无效。"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "信件的发件夹字段无效。"
+
+#~ msgid "Hos&tname:"
+#~ msgstr "主机名(&T)："
+
+#~ msgid "Local sendmail"
+#~ msgstr "本地 sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "执行邮件发送程序 %1 失败"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail 异常退出。"
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail 异常退出：%1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "本地 sendmail 安装"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Sendmail 的位置(&L)："
+
+#~ msgid "Mail &server:"
+#~ msgstr "邮件服务器(&S)："
diff -Nru kmailtransport-16.12.3/po/zh_TW/kio_smtp.po kmailtransport-17.04.3/po/zh_TW/kio_smtp.po
--- kmailtransport-16.12.3/po/zh_TW/kio_smtp.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/zh_TW/kio_smtp.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,233 @@
+# translation of kio_smtp.po to Chinese Traditional
+# Copyright (C) 2007, 2008 Free Software Foundation, Inc.
+#
+# Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv dot tw>, 2007, 2009, 2010.
+# Franklin Weng <franklin at goodhorse dot idv dot tw>, 2007, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: kio_smtp\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2010-05-31 09:31+0800\n"
+"Last-Translator: Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv "
+"dot tw>\n"
+"Language-Team: Chinese Traditional <zh-l10n@linux.org.tw>\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: command.cpp:148
+#, kde-format
+msgid ""
+"The server rejected both EHLO and HELO commands as unknown or "
+"unimplemented.\n"
+"Please contact the server's system administrator."
+msgstr ""
+"該伺服器對 EHLO 與 HELO 指令以未知或未實作拒絕。\n"
+"請連絡該伺服器的系統管理者。"
+
+#: command.cpp:162
+#, kde-format
+msgid ""
+"Unexpected server response to %1 command.\n"
+"%2"
+msgstr ""
+"對 %1 指令未預期的伺服器回應。\n"
+"%2"
+
+#: command.cpp:186
+#, kde-format
+msgid ""
+"Your SMTP server does not support TLS. Disable TLS, if you want to connect "
+"without encryption."
+msgstr ""
+"您的郵件主機並不支援 TLS。如果你希望在沒有加密的情況下進行連線，請關閉 TLS 選"
+"項。"
+
+#: command.cpp:197
+#, kde-format
+msgid ""
+"Your SMTP server claims to support TLS, but negotiation was unsuccessful.\n"
+"You can disable TLS in the SMTP account settings dialog."
+msgstr ""
+"您的 SMTP 主機要求支援 TLS，不過溝通並沒有成功。\n"
+"您可以在 SMTP 帳號設定對話框中將 TLS 關掉。"
+
+#: command.cpp:201
+#, kde-format
+msgid "Connection Failed"
+msgstr "連線失敗"
+
+#: command.cpp:207
+#, kde-format
+msgid "An error occurred during authentication: %1"
+msgstr "認證時發生錯誤：%1"
+
+#: command.cpp:274
+#, kde-format
+msgid "No authentication details supplied."
+msgstr "沒有支援的驗證詳細資訊。"
+
+#: command.cpp:384
+#, kde-format
+msgid "Choose a different authentication method."
+msgstr "選擇不同的認證方法。"
+
+#: command.cpp:386
+#, kde-format
+msgid "Your SMTP server does not support %1."
+msgstr "您的 SMTP 主機不支援 %1。"
+
+#: command.cpp:387
+#, kde-format
+msgid "Your SMTP server does not support (unspecified method)."
+msgstr "您的 SMTP 主機不支援（未知的方法）。"
+
+#: command.cpp:391
+#, kde-format
+msgid ""
+"Your SMTP server does not support authentication.\n"
+"%1"
+msgstr ""
+"您的 SMTP 主機不支援認證。\n"
+"%1"
+
+#: command.cpp:396
+#, kde-format
+msgid ""
+"Authentication failed.\n"
+"Most likely the password is wrong.\n"
+"%1"
+msgstr ""
+"認證失敗。\n"
+"可能是您的密碼錯誤。\n"
+"%1"
+
+#: command.cpp:553
+#, kde-format
+msgid "Could not read data from application."
+msgstr "無法從應用程式讀取資料。"
+
+#: command.cpp:571
+#, kde-format
+msgid ""
+"The message content was not accepted.\n"
+"%1"
+msgstr ""
+"該郵件內容失敗。\n"
+"%1"
+
+#: response.cpp:110
+#, kde-format
+msgid ""
+"The server responded:\n"
+"%1"
+msgstr ""
+"該伺服器回應：\n"
+"%1"
+
+#: response.cpp:112
+#, kde-format
+msgid "The server responded: \"%1\""
+msgstr "郵件主機訊息：\"%1\""
+
+#: response.cpp:115
+#, kde-format
+msgid "This is a temporary failure. You may try again later."
+msgstr "這是暫時性的失敗。您可以稍後再試一次。"
+
+#: smtp.cpp:146
+#, kde-format
+msgid "The application sent an invalid request."
+msgstr "該應用程式送出不合法的要求。"
+
+#: smtp.cpp:208
+#, kde-format
+msgid "The sender address is missing."
+msgstr "發信人的電子郵件沒有輸入。"
+
+#: smtp.cpp:215
+#, kde-format
+msgid "SMTPProtocol::smtp_open failed (%1)"
+msgstr "SMTPProtocol::smtp_open 失敗 (%1)"
+
+#: smtp.cpp:223
+#, kde-format
+msgid ""
+"Your server (%1) does not support sending of 8-bit messages.\n"
+"Please use base64 or quoted-printable encoding."
+msgstr ""
+"您的伺服器（%1）不支援傳送 8-位元郵件。\n"
+"請使用 base64 或 quoted-printable 編碼。"
+
+#: smtp.cpp:272
+#, kde-format
+msgid "Writing to socket failed."
+msgstr "寫入 socket 失敗。"
+
+#: smtp.cpp:311
+#, kde-format
+msgid "Invalid SMTP response (%1) received."
+msgstr "收到無效的 SMTP 回應(%1)。"
+
+#: smtp.cpp:537
+#, kde-format
+msgid ""
+"The server (%1) did not accept the connection.\n"
+"%2"
+msgstr ""
+"伺服器（%1）不接受連線。\n"
+"%2"
+
+#: smtp.cpp:602
+#, kde-format
+msgid "Username and password for your SMTP account:"
+msgstr "您 SMTP 帳號的使用者名稱與密碼:"
+
+#: transactionstate.cpp:50
+#, kde-format
+msgid ""
+"The server did not accept a blank sender address.\n"
+"%1"
+msgstr ""
+"郵件主機不接受空白的發信人電子郵件位址。\n"
+"%1"
+
+#: transactionstate.cpp:53
+#, kde-format
+msgid ""
+"The server did not accept the sender address \"%1\".\n"
+"%2"
+msgstr ""
+"郵件主機不接受發信人的電子郵件位址「%1」。\n"
+"%2"
+
+#: transactionstate.cpp:112
+#, kde-format
+msgid ""
+"Message sending failed since the following recipients were rejected by the "
+"server:\n"
+"%1"
+msgstr ""
+"郵件傳送失敗，因為下列收件者被伺服器拒絕：\n"
+"%1"
+
+#: transactionstate.cpp:117
+#, kde-format
+msgid ""
+"The attempt to start sending the message content failed.\n"
+"%1"
+msgstr ""
+"試圖傳送訊息內容失敗。\n"
+"%1"
+
+#: transactionstate.cpp:122
+#, kde-format
+msgid "Unhandled error condition. Please send a bug report."
+msgstr "未處理的錯誤狀況。請傳送一份錯誤回報。"
+
+#~ msgid "Authentication support is not compiled into kio_smtp."
+#~ msgstr "驗證沒有編譯至 kio_smtp。"
diff -Nru kmailtransport-16.12.3/po/zh_TW/libmailtransport5.po kmailtransport-17.04.3/po/zh_TW/libmailtransport5.po
--- kmailtransport-16.12.3/po/zh_TW/libmailtransport5.po	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/po/zh_TW/libmailtransport5.po	2017-07-11 00:26:20.000000000 +0000
@@ -0,0 +1,809 @@
+# translation of libmailtransport.po to
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Franklin Weng <franklin at goodhorse dot idv dot tw>, 2007, 2008.
+# Franklin Weng <franklin@mail.everfocus.com.tw>, 2008, 2010.
+# Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv dot tw>, 2008, 2009, 2010.
+# Franklin Weng <franklin@goodhorse.idv.tw>, 2012, 2013, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: libmailtransport\n"
+"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
+"POT-Creation-Date: 2017-04-07 04:38+0200\n"
+"PO-Revision-Date: 2015-02-20 23:02+0800\n"
+"Last-Translator: Franklin Weng <franklin@goodhorse.idv.tw>\n"
+"Language-Team: Chinese Traditional <kde-i18n-doc@kde.org>\n"
+"Language: zh_TW\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.5\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. i18n: ectx: label, entry (id), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:12
+#, kde-format
+msgid "Unique identifier"
+msgstr "唯一身份"
+
+#. i18n: ectx: label, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:16
+#, kde-format
+msgid "User-visible transport name"
+msgstr "使用者可見的傳送名撐"
+
+#. i18n: ectx: whatsthis, entry (name), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:17
+#, kde-format
+msgid "The name that will be used when referring to this server."
+msgstr "這個伺服器的名稱"
+
+#: kmailtransport/mailtransport.kcfg:18
+#, kde-format
+msgid "Unnamed"
+msgstr "未命名"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:23
+#, kde-format
+msgid "SMTP Server"
+msgstr "SMTP 伺服器"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:26
+#, kde-format
+msgid "Akonadi Resource"
+msgstr "Akonadi 資源"
+
+#. i18n: ectx: label, entry (type), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:29
+#, kde-format
+msgid "Transport type"
+msgstr "傳送型態"
+
+#. i18n: ectx: label, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:33
+#, kde-format
+msgid "Host name of the server"
+msgstr "伺服器主機名稱"
+
+#. i18n: ectx: whatsthis, entry (host), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:34
+#, kde-format
+msgid "The domain name or numerical address of the SMTP server."
+msgstr "SMTP 伺服器的網域名稱或 IP 位址。"
+
+#. i18n: ectx: label, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:37
+#, kde-format
+msgid "Port number of the server"
+msgstr "伺服器連接埠號"
+
+#. i18n: ectx: whatsthis, entry (port), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:38
+#, kde-format
+msgid ""
+"The port number that the SMTP server is listening on. The default port is 25."
+msgstr "SMTP 伺服器使用的埠號。預設值為 25。"
+
+#. i18n: ectx: label, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:42
+#, kde-format
+msgid "User name needed for login"
+msgstr "登入的帳號"
+
+#. i18n: ectx: whatsthis, entry (userName), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:43
+#, kde-format
+msgid "The user name to send to the server for authorization."
+msgstr "要送給伺服器做認證的使用者名稱。"
+
+#. i18n: ectx: label, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:46
+#, kde-format
+msgid "Command to execute before sending a mail"
+msgstr "送出信件前執行的指令"
+
+#. i18n: ectx: whatsthis, entry (precommand), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:47
+#, kde-format
+msgid ""
+"A command to run locally, prior to sending email. This can be used to set up "
+"SSH tunnels, for example. Leave it empty if no command should be run."
+msgstr ""
+"在送信前執行的命令。例如可以設定 ssh 通道。如果沒有要執行的命令就請留白。"
+
+#. i18n: ectx: label, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:50
+#, kde-format
+msgid "Server requires authentication"
+msgstr "伺服器需要通過認證"
+
+#. i18n: ectx: whatsthis, entry (requiresAuthentication), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:51
+#, kde-format
+msgid ""
+"Check this option if your SMTP server requires authentication before "
+"accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP."
+msgstr ""
+"如果您的 SMTP 伺服器需要身份認證，請勾選這個選項。這就是所謂的 Authenticated "
+"SMTP 或 ASMTP。"
+
+#. i18n: ectx: label, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:55
+#, kde-format
+msgid "Store password"
+msgstr "儲存密碼"
+
+#. i18n: ectx: whatsthis, entry (storePassword), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:58
+#, kde-format
+msgid ""
+"Check this option to have your password stored.\n"
+"If KWallet is available the password will be stored there, which is "
+"considered safe.\n"
+"However, if KWallet is not available, the password will be stored in the "
+"configuration file. The password is stored in an obfuscated format, but "
+"should not be considered secure from decryption efforts if access to the "
+"configuration file is obtained."
+msgstr ""
+"勾選這個選項，KMail 會將您的密碼儲存下來。\n"
+"如果您的系統中有使用 KWallet，密碼將會儲存在 KWallet以提供較安全的保護。\n"
+"如果沒有 KWallet 的話，密碼將會儲存在 KMail 的設定檔中，並做簡單的加密。但是"
+"這仍然不保證密碼可以安全地不被破解。"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:62
+#, kde-format
+msgid "Encryption method used for communication"
+msgstr "通訊時使用的加密方法"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:65
+#, kde-format
+msgid "No encryption"
+msgstr "不加密"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:68
+#, kde-format
+msgid "SSL encryption"
+msgstr "SSL 加密"
+
+#. i18n: ectx: label, entry (encryption), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:71
+#, kde-format
+msgid "TLS encryption"
+msgstr "TLS 加密"
+
+#. i18n: ectx: label, entry (authenticationType), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:76
+#, kde-format
+msgid "Authentication method"
+msgstr "認證方法"
+
+#. i18n: ectx: label, entry (specifyHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (localHostname), group (Transport $(transportId))
+#. i18n: ectx: label, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#. i18n: ectx: label, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:93 kmailtransport/mailtransport.kcfg:98
+#: kmailtransport/mailtransport.kcfg:102 kmailtransport/mailtransport.kcfg:107
+#, kde-format
+msgid "<!-- TODO -->"
+msgstr "<!-- TODO -->"
+
+#. i18n: ectx: whatsthis, entry (specifyHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:94
+#, kde-format
+msgid ""
+"Check this option to use a custom hostname when identifying to the mail "
+"server. This is useful when your system's hostname may not be set correctly "
+"or to mask your system's true hostname."
+msgstr ""
+"這個選項讓 KMail 在與伺服器溝通時，使用不同的主機名稱。如果您的系統主機設定不"
+"正確，或是您不想讓其他人知道您的主機名稱時，可以使用這個選項。   "
+
+#. i18n: ectx: whatsthis, entry (localHostname), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:99
+#, kde-format
+msgid "Enter the hostname that should be used when identifying to the server."
+msgstr "請輸入 KMail 與伺服器溝通時使用的主機名稱。"
+
+#. i18n: ectx: whatsthis, entry (specifySenderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:103
+#, kde-format
+msgid ""
+"Check this option to use a custom sender address when identifying to the "
+"mail server. If not checked, the address from the identity is used."
+msgstr ""
+"這個選項讓您在與伺服器溝通時，使用不同的寄件者位址。若未勾選，則使用此身份的"
+"電子郵件地址。"
+
+#. i18n: ectx: whatsthis, entry (senderOverwriteAddress), group (Transport $(transportId))
+#: kmailtransport/mailtransport.kcfg:108
+#, kde-format
+msgid ""
+"Enter the address that should be used to overwrite the default sender "
+"address."
+msgstr "請輸入與伺服器溝通時使用的電子郵件地址。"
+
+#: kmailtransport/precommandjob.cpp:81
+#, kde-format
+msgid "Executing precommand"
+msgstr "執行前置命令"
+
+#: kmailtransport/precommandjob.cpp:82
+#, kde-format
+msgid "Executing precommand '%1'."
+msgstr "執行前置命令 %1。"
+
+#: kmailtransport/precommandjob.cpp:89
+#, kde-format
+msgid "Unable to start precommand '%1'."
+msgstr "無法啟動前置命令：%1。"
+
+#: kmailtransport/precommandjob.cpp:91
+#, kde-format
+msgid "Error while executing precommand '%1'."
+msgstr "執行前置命令 %1 時發生錯誤。"
+
+#: kmailtransport/precommandjob.cpp:107
+#, kde-format
+msgid "The precommand crashed."
+msgstr "執行前置命令失敗。"
+
+#: kmailtransport/precommandjob.cpp:110
+#, kde-format
+msgid "The precommand exited with code %1."
+msgstr "前置命令結束傳回碼 %1。"
+
+#: kmailtransport/smtpjob.cpp:175
+#, kde-format
+msgid "You need to supply a username and a password to use this SMTP server."
+msgstr "您必須提供此 SMTP 伺服器使用的帳號與密碼。"
+
+#: kmailtransport/smtpjob.cpp:232
+#, kde-format
+msgid "Unable to create SMTP job."
+msgstr "無法建立 SMTP 工作。"
+
+#: kmailtransport/transport.cpp:92
+#, kde-format
+msgctxt ""
+"%1: name; %2: number appended to it to make it unique among a list of names"
+msgid "%1 #%2"
+msgstr "%1 #%2"
+
+#: kmailtransport/transport.cpp:139
+#, kde-format
+msgctxt "Authentication method"
+msgid "Clear text"
+msgstr "明碼"
+
+#: kmailtransport/transport.cpp:143
+#, kde-format
+msgctxt "Authentication method"
+msgid "Anonymous"
+msgstr "匿名"
+
+#: kmailtransport/transport.cpp:172
+#, kde-format
+msgctxt "An unknown transport type"
+msgid "Unknown"
+msgstr "未知"
+
+#: kmailtransport/transport.cpp:226
+#, kde-format
+msgid ""
+"KWallet is not available. It is strongly recommended to use KWallet for "
+"managing your passwords.\n"
+"However, the password can be stored in the configuration file instead. The "
+"password is stored in an obfuscated format, but should not be considered "
+"secure from decryption efforts if access to the configuration file is "
+"obtained.\n"
+"Do you want to store the password for server '%1' in the configuration file?"
+msgstr ""
+"無法使用 KWallet。強烈建議您使用 KWallet 來管理您的密碼。\n"
+"如果沒有 KWallet 的話，密碼將會保存在 KMail 的設定檔中，並做簡單的加密。但是"
+"這仍然不保證密碼可以安全地不被破解。\n"
+"您確定要將帳號 %1 的密碼存在設定檔中嗎？"
+
+#: kmailtransport/transport.cpp:234
+#, kde-format
+msgid "KWallet Not Available"
+msgstr "無法使用 KWallet"
+
+#: kmailtransport/transport.cpp:235
+#, kde-format
+msgid "Store Password"
+msgstr "儲存密碼"
+
+#: kmailtransport/transport.cpp:236
+#, kde-format
+msgid "Do Not Store Password"
+msgstr "不要儲存"
+
+#: kmailtransport/transportjob.cpp:131
+#, kde-format
+msgid "The outgoing account \"%1\" is not correctly configured."
+msgstr "外送帳號 %1 未正確設定。"
+
+#: kmailtransport/transportmanager.cpp:249
+#, kde-format
+msgid "Default Transport"
+msgstr "預設傳送設定"
+
+#: kmailtransport/transportmanager.cpp:268
+#, kde-format
+msgid "You must create an outgoing account before sending."
+msgstr "您必須建立外送郵件帳號才能傳送信件。"
+
+#: kmailtransport/transportmanager.cpp:269
+#, kde-format
+msgid "Create Account Now?"
+msgstr "要現在建立帳號嗎？"
+
+#: kmailtransport/transportmanager.cpp:270
+#, kde-format
+msgid "Create Account Now"
+msgstr "現在建立帳號"
+
+#: kmailtransport/transportmanager.cpp:286
+#, kde-format
+msgid "Configure account"
+msgstr "設定帳號"
+
+#: kmailtransport/transportmanager.cpp:472
+#, kde-format
+msgctxt "@option SMTP transport"
+msgid "SMTP"
+msgstr "SMTP"
+
+#: kmailtransport/transportmanager.cpp:473
+#, kde-format
+msgid "An SMTP server on the Internet"
+msgstr "網際網路上的 SMTP 伺服器"
+
+#: kmailtransport/transportmanager.cpp:668
+#, kde-format
+msgid ""
+"The following mail transports store their passwords in an unencrypted "
+"configuration file.\n"
+"For security reasons, please consider migrating these passwords to KWallet, "
+"the KDE Wallet management tool,\n"
+"which stores sensitive data for you in a strongly encrypted file.\n"
+"Do you want to migrate your passwords to KWallet?"
+msgstr ""
+"以下的傳送設定將密碼存在一個未加密的設定檔中。\n"
+"強烈建議使用 KWallet 來儲存密碼，因為有較高的安全性。\n"
+"您要將您的密碼移到 KWallet 中嗎？"
+
+#: kmailtransport/transportmanager.cpp:674
+#, kde-format
+msgid "Question"
+msgstr "問題"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Migrate"
+msgstr "請幫我移動"
+
+#: kmailtransport/transportmanager.cpp:675
+#, kde-format
+msgid "Keep"
+msgstr "保持現狀"
+
+#. i18n: ectx: property (windowTitle), widget (QWidget, AddTransportDialog)
+#: kmailtransport/ui/addtransportdialog.ui:20
+#, kde-format
+msgid "Step One: Select Transport Type"
+msgstr "步驟 1：選擇傳輸型態"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/addtransportdialog.ui:41
+#, kde-format
+msgctxt "The name of a mail transport"
+msgid "Name:"
+msgstr "名稱："
+
+#. i18n: ectx: property (text), widget (QCheckBox, setDefault)
+#: kmailtransport/ui/addtransportdialog.ui:51
+#, kde-format
+msgid "Make this the default outgoing account."
+msgstr "將此設為預設的外寄帳號。"
+
+#. i18n: ectx: property (text), widget (QLabel, descLabel)
+#: kmailtransport/ui/addtransportdialog.ui:64
+#, kde-format
+msgid "Select an account type from the list below:"
+msgstr "從以下清單中選擇帳號型態："
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:84
+#, kde-format
+msgid "Type"
+msgstr "型態"
+
+#. i18n: ectx: property (text), widget (QTreeWidget, typeListView)
+#: kmailtransport/ui/addtransportdialog.ui:89
+#, kde-format
+msgid "Description"
+msgstr "描述"
+
+#. i18n: ectx: attribute (title), widget (QWidget, smptTab)
+#: kmailtransport/ui/smtpsettings.ui:34
+#, kde-format
+msgctxt "general smtp settings"
+msgid "General"
+msgstr "一般"
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox)
+#: kmailtransport/ui/smtpsettings.ui:40
+#, kde-format
+msgid "Account Information"
+msgstr "帳號資訊"
+
+#. i18n: ectx: property (text), widget (QLabel, hostLabel)
+#: kmailtransport/ui/smtpsettings.ui:46
+#, fuzzy, kde-format
+#| msgid "Outgoing mail &server:"
+msgid "Outgoing &mail server:"
+msgstr "外寄信件伺服器(&S)："
+
+#. i18n: ectx: property (text), widget (QLabel, usernameLabel)
+#: kmailtransport/ui/smtpsettings.ui:69
+#, kde-format
+msgid "&Login:"
+msgstr "帳號(&L)："
+
+#. i18n: ectx: property (text), widget (QLabel, passwordLabel)
+#: kmailtransport/ui/smtpsettings.ui:95
+#, kde-format
+msgid "P&assword:"
+msgstr "密碼(&A)："
+
+#. i18n: ectx: property (whatsThis), widget (KLineEdit, password)
+#: kmailtransport/ui/smtpsettings.ui:111
+#, kde-format
+msgid "The password to send to the server for authorization."
+msgstr "要送到伺服器認證用的密碼。"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_storePassword)
+#: kmailtransport/ui/smtpsettings.ui:127
+#, kde-format
+msgid "&Store SMTP password"
+msgstr "儲存 SMTP 密碼(&S)"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_requiresAuthentication)
+#: kmailtransport/ui/smtpsettings.ui:134
+#, kde-format
+msgid "Server &requires authentication"
+msgstr "伺服器需要認證(&R)"
+
+#. i18n: ectx: attribute (title), widget (QWidget, advancedTab)
+#: kmailtransport/ui/smtpsettings.ui:158
+#, kde-format
+msgctxt "advanced smtp settings"
+msgid "Advanced"
+msgstr "進階"
+
+#. i18n: ectx: property (title), widget (QGroupBox, encryptionGroup)
+#: kmailtransport/ui/smtpsettings.ui:167
+#, kde-format
+msgid "Connection Settings"
+msgstr "連線設定"
+
+#. i18n: ectx: property (text), widget (QPushButton, checkCapabilities)
+#: kmailtransport/ui/smtpsettings.ui:180
+#, kde-format
+msgid "Auto Detect"
+msgstr "自動偵測"
+
+#. i18n: ectx: property (text), widget (QLabel, noAuthPossible)
+#: kmailtransport/ui/smtpsettings.ui:214
+#, kde-format
+msgid "This server does not support authentication"
+msgstr "此伺服器不支援認證"
+
+#. i18n: ectx: property (text), widget (QLabel, label)
+#: kmailtransport/ui/smtpsettings.ui:229
+#, kde-format
+msgid "Encryption:"
+msgstr "加密："
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionNone)
+#: kmailtransport/ui/smtpsettings.ui:238
+#, kde-format
+msgid "&None"
+msgstr "無(&N)"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionSsl)
+#: kmailtransport/ui/smtpsettings.ui:245
+#, kde-format
+msgid "&SSL"
+msgstr "SSL(&S)"
+
+#. i18n: ectx: property (text), widget (QRadioButton, encryptionTls)
+#: kmailtransport/ui/smtpsettings.ui:252
+#, kde-format
+msgid "&TLS"
+msgstr "TLS(&T)"
+
+#. i18n: ectx: property (text), widget (QLabel, portLabel)
+#: kmailtransport/ui/smtpsettings.ui:261
+#, kde-format
+msgid "&Port:"
+msgstr "連接埠(&P)："
+
+#. i18n: ectx: property (text), widget (QLabel, authLabel)
+#: kmailtransport/ui/smtpsettings.ui:287
+#, kde-format
+msgid "Authentication:"
+msgstr "認證："
+
+#. i18n: ectx: property (title), widget (QGroupBox, groupBox_2)
+#: kmailtransport/ui/smtpsettings.ui:302
+#, kde-format
+msgid "SMTP Settings"
+msgstr "SMTP 設定"
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifyHostname)
+#: kmailtransport/ui/smtpsettings.ui:308
+#, kde-format
+msgid "Sen&d custom hostname to server"
+msgstr "送出不同的主機名稱到伺服器上(&D)"
+
+#. i18n: ectx: property (text), widget (QLabel, hostnameLabel)
+#: kmailtransport/ui/smtpsettings.ui:318
+#, fuzzy, kde-format
+#| msgid "&Host:"
+msgid "Hostna&me:"
+msgstr "主機(&H)："
+
+#. i18n: ectx: property (text), widget (QCheckBox, kcfg_specifySenderOverwriteAddress)
+#: kmailtransport/ui/smtpsettings.ui:341
+#, kde-format
+msgid "Use custom sender address"
+msgstr "使用自訂的寄件者位址"
+
+#. i18n: ectx: property (text), widget (QLabel, label_2)
+#: kmailtransport/ui/smtpsettings.ui:351
+#, kde-format
+msgid "Sender Address:"
+msgstr "寄件者位址："
+
+#. i18n: ectx: property (text), widget (QLabel, precommandLabel)
+#: kmailtransport/ui/smtpsettings.ui:368
+#, kde-format
+msgid "Precommand:"
+msgstr "前置命令："
+
+#. i18n: ectx: property (text), widget (QPushButton, removeButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:17
+#, kde-format
+msgid "Remo&ve"
+msgstr "移除(&V)"
+
+#. i18n: ectx: property (text), widget (QPushButton, defaultButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:24
+#, kde-format
+msgid "&Set as Default"
+msgstr "設為預設(&S)"
+
+#. i18n: ectx: property (text), widget (QPushButton, addButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:51
+#, kde-format
+msgid "A&dd..."
+msgstr "新增(&D)..."
+
+#. i18n: ectx: property (text), widget (QPushButton, renameButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:58
+#, kde-format
+msgid "&Rename"
+msgstr "重新命名(&R)"
+
+#. i18n: ectx: property (text), widget (QPushButton, editButton)
+#: kmailtransport/ui/transportmanagementwidget.ui:65
+#, kde-format
+msgid "&Modify..."
+msgstr "變更(&M)..."
+
+#: kmailtransport/widgets/addtransportdialog.cpp:112
+#, kde-format
+msgid "Create Outgoing Account"
+msgstr "建立外送帳號"
+
+#: kmailtransport/widgets/addtransportdialog.cpp:115
+#, kde-format
+msgctxt "create and configure a mail transport"
+msgid "Create and Configure"
+msgstr "建立並設定"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid ""
+"Failed to check capabilities. Please verify port and authentication mode."
+msgstr "檢查容量時失敗。請檢查連接埠與認證模式。"
+
+#: kmailtransport/widgets/smtpconfigwidget.cpp:273
+#, kde-format
+msgid "Check Capabilities Failed"
+msgstr "檢查容量失敗"
+
+#: kmailtransport/widgets/transportconfigdialog.cpp:98
+#, kde-format
+msgid "This outgoing account cannot be configured."
+msgstr "此外送帳號無法被設定。"
+
+#: kmailtransport/widgets/transportlistview.cpp:41
+#, kde-format
+msgctxt "@title:column email transport name"
+msgid "Name"
+msgstr "名稱"
+
+#: kmailtransport/widgets/transportlistview.cpp:42
+#, kde-format
+msgctxt "@title:column email transport type"
+msgid "Type"
+msgstr "型態"
+
+#: kmailtransport/widgets/transportlistview.cpp:113
+#, kde-format
+msgctxt "@label the default mail transport"
+msgid " (Default)"
+msgstr "（預設）"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:137
+#, kde-format
+msgid "Do you want to remove outgoing account '%1'?"
+msgstr "您確定要移除外送帳號 %1 嗎？"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:139
+#, kde-format
+msgid "Remove outgoing account?"
+msgstr "要移除外送帳號嗎？"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:161
+#, kde-format
+msgid "Add..."
+msgstr "新增..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:164
+#, kde-format
+msgid "Modify..."
+msgstr "變更..."
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:165
+#, kde-format
+msgid "Rename"
+msgstr "重新命名"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:166
+#, kde-format
+msgid "Remove"
+msgstr "移除"
+
+#: kmailtransport/widgets/transportmanagementwidget.cpp:169
+#, kde-format
+msgid "Set as Default"
+msgstr "設成預設值"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:77
+#, kde-format
+msgid "Empty message."
+msgstr "空白的信件。"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:85
+#, kde-format
+msgid "Message has no recipients."
+msgstr "信件沒有收件人。"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:93
+#, kde-format
+msgid "Message has invalid transport."
+msgstr "信件的傳輸不正確。"
+
+#: kmailtransportakonadi/messagequeuejob.cpp:101
+#, kde-format
+msgid "Message has invalid sent-mail folder."
+msgstr "信件有一個不合法的寄件備份資料夾。"
+
+#~ msgid "Hos&tname:"
+#~ msgstr "主機名稱(&T)："
+
+#~ msgid "Local sendmail"
+#~ msgstr "本地端的 sendmail"
+
+#~ msgid "Failed to execute mailer program %1"
+#~ msgstr "執行發信程式 %1 失敗"
+
+#~ msgid "Sendmail exited abnormally."
+#~ msgstr "Sendmail 不正常結束。"
+
+#~ msgid "Sendmail exited abnormally: %1"
+#~ msgstr "Sendmail 不正常結束：%1"
+
+#~ msgctxt "@option sendmail transport"
+#~ msgid "Sendmail"
+#~ msgstr "Sendmail"
+
+#~ msgid "A local sendmail installation"
+#~ msgstr "本地端的 sendmail"
+
+#~ msgid "Sendmail &Location:"
+#~ msgstr "Sendmail 位置(&L)："
+
+#~ msgid "Mail &server:"
+#~ msgstr "郵件伺服器(&S)："
+
+#~ msgid "Edit..."
+#~ msgstr "編輯..."
+
+#~ msgid "text"
+#~ msgstr "文字"
+
+#~ msgid "Check &What the Server Supports"
+#~ msgstr "檢查伺服器支援的協定(&W)"
+
+#~ msgid "Authentication Method"
+#~ msgstr "認證方法"
+
+#~ msgid "&LOGIN"
+#~ msgstr "LOGIN(&L)"
+
+#~ msgid "&PLAIN"
+#~ msgstr "PLAIN(&P)"
+
+#~ msgid "CRAM-MD&5"
+#~ msgstr "CRAM-MD5(&5)"
+
+#~ msgid "&DIGEST-MD5"
+#~ msgstr "DIGEST-MD5(&D)"
+
+#~ msgid "&GSSAPI"
+#~ msgstr "GSSAPI(&G)"
+
+#~ msgid "&NTLM"
+#~ msgstr "NTLM(&N)"
+
+#~ msgid "Message has invalid due date."
+#~ msgstr "信件的到期日不正確。"
+
+#~ msgid "Transport: Sendmail"
+#~ msgstr "傳送：Sendmail"
+
+#~ msgid "&Location:"
+#~ msgstr "位置(&L)："
+
+#~ msgid "Choos&e..."
+#~ msgstr "選擇(&E)..."
+
+#~ msgid "Transport: SMTP"
+#~ msgstr "傳送：SMTP"
+
+#~ msgid "1"
+#~ msgstr "1"
+
+#~ msgid "Use Sendmail"
+#~ msgstr "使用 Sendmail"
+
+#~ msgid "Only local files allowed."
+#~ msgstr "只允許本地檔案。"
+
+#~ msgctxt "@title:window"
+#~ msgid "Add Transport"
+#~ msgstr "新增傳送設定"
+
+#~ msgctxt "@title:window"
+#~ msgid "Modify Transport"
+#~ msgstr "變更傳送設定"
+
+#~ msgid "SM&TP"
+#~ msgstr "SMTP(&T)"
+
+#~ msgid "&Sendmail"
+#~ msgstr "Sendmail(&S)"
+
+#~ msgid "Add Transport"
+#~ msgstr "新增傳送設定"
diff -Nru kmailtransport-16.12.3/src/addtransportdialog.cpp kmailtransport-17.04.3/src/addtransportdialog.cpp
--- kmailtransport-16.12.3/src/addtransportdialog.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/addtransportdialog.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,194 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "addtransportdialog.h"
-#include "transport.h"
-#include "transportconfigwidget.h"
-#include "transportmanager.h"
-#include "transporttype.h"
-#include "ui_addtransportdialog.h"
-
-#include "mailtransport_debug.h"
-#include <QDialogButtonBox>
-
-#include <QPushButton>
-#include <agentinstance.h>
-#include <agentinstancecreatejob.h>
-
-using namespace MailTransport;
-
-/**
-  @internal
-*/
-class AddTransportDialog::Private
-{
-public:
-    Private(AddTransportDialog *qq)
-        : q(qq), okButton(Q_NULLPTR)
-    {
-    }
-
-    /**
-      Returns the currently selected type in the type selection widget, or
-      an invalid type if none is selected.
-    */
-    TransportType selectedType() const;
-
-    /**
-      Enables the OK button if a type is selected.
-    */
-    void updateOkButton(); // slot
-    void doubleClicked(); //slot
-    void writeConfig();
-    void readConfig();
-
-    AddTransportDialog *const q;
-    QPushButton *okButton;
-    ::Ui::AddTransportDialog ui;
-};
-
-void AddTransportDialog::Private::writeConfig()
-{
-    KConfigGroup group(KSharedConfig::openConfig(), "AddTransportDialog");
-    group.writeEntry("Size", q->size());
-}
-
-void AddTransportDialog::Private::readConfig()
-{
-    KConfigGroup group(KSharedConfig::openConfig(), "AddTransportDialog");
-    const QSize sizeDialog = group.readEntry("Size", QSize(300, TransportManager::self()->types().size() > 1 ? 200 : 80));
-    if (sizeDialog.isValid()) {
-        q->resize(sizeDialog);
-    }
-}
-
-TransportType AddTransportDialog::Private::selectedType() const
-{
-    QList<QTreeWidgetItem *> sel = ui.typeListView->selectedItems();
-    if (!sel.empty()) {
-        return sel.first()->data(0, Qt::UserRole).value<TransportType>();
-    }
-    return TransportType();
-}
-
-void AddTransportDialog::Private::doubleClicked()
-{
-    if (selectedType().isValid() && !ui.name->text().trimmed().isEmpty()) {
-        q->accept();
-    }
-}
-
-void AddTransportDialog::Private::updateOkButton()
-{
-    // Make sure a type is selected before allowing the user to continue.
-    okButton->setEnabled(selectedType().isValid() && !ui.name->text().trimmed().isEmpty());
-}
-
-AddTransportDialog::AddTransportDialog(QWidget *parent)
-    : QDialog(parent), d(new Private(this))
-{
-    // Setup UI.
-    {
-        QVBoxLayout *mainLayout = new QVBoxLayout(this);
-        QWidget *widget = new QWidget(this);
-        d->ui.setupUi(widget);
-        mainLayout->addWidget(widget);
-        setWindowTitle(i18n("Create Outgoing Account"));
-        QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
-        d->okButton = buttonBox->button(QDialogButtonBox::Ok);
-        d->okButton->setText(i18nc("create and configure a mail transport", "Create and Configure"));
-        d->okButton->setEnabled(false);
-        d->okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
-        mainLayout->addWidget(buttonBox);
-        connect(buttonBox, &QDialogButtonBox::accepted, this, &AddTransportDialog::accept);
-        connect(buttonBox, &QDialogButtonBox::rejected, this, &AddTransportDialog::reject);
-    }
-
-    // Populate type list.
-    const auto transportTypes = TransportManager::self()->types();
-    foreach (const TransportType &type, transportTypes) {
-        QTreeWidgetItem *treeItem = new QTreeWidgetItem(d->ui.typeListView);
-        treeItem->setText(0, type.name());
-        treeItem->setText(1, type.description());
-        treeItem->setData(0, Qt::UserRole, QVariant::fromValue(type));     // the transport type
-        if (type.type() == TransportBase::EnumType::SMTP)
-            treeItem->setSelected(true); // select SMTP by default
-    }
-    d->ui.typeListView->resizeColumnToContents(0);
-
-    // if we only have one type, don't bother the user with this
-    if (d->ui.typeListView->invisibleRootItem()->childCount() == 1) {
-        d->ui.descLabel->hide();
-        d->ui.typeListView->hide();
-    }
-
-    updateGeometry();
-    d->ui.typeListView->setFocus();
-
-    // Connect user input.
-    connect(d->ui.typeListView, SIGNAL(itemClicked(QTreeWidgetItem*,int)),
-            this, SLOT(updateOkButton()));
-    connect(d->ui.typeListView, SIGNAL(itemSelectionChanged()),
-            this, SLOT(updateOkButton()));
-    connect(d->ui.typeListView, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)),
-            this, SLOT(doubleClicked()));
-    connect(d->ui.name, SIGNAL(textChanged(QString)),
-            this, SLOT(updateOkButton()));
-    d->readConfig();
-}
-
-AddTransportDialog::~AddTransportDialog()
-{
-    d->writeConfig();
-    delete d;
-}
-
-void AddTransportDialog::accept()
-{
-    if (!d->selectedType().isValid()) {
-        return;
-    }
-
-    // Create a new transport and configure it.
-    Transport *transport = TransportManager::self()->createTransport();
-    transport->setTransportType(d->selectedType());
-    if (d->selectedType().type() == Transport::EnumType::Akonadi) {
-        // Create a resource instance if Akonadi-type transport.
-        using namespace Akonadi;
-        AgentInstanceCreateJob *cjob = new AgentInstanceCreateJob(d->selectedType().agentType());
-        if (!cjob->exec()) {
-            qCWarning(MAILTRANSPORT_LOG) << "Failed to create agent instance of type"
-                                         << d->selectedType().agentType().identifier();
-            return;
-        }
-        transport->setHost(cjob->instance().identifier());
-    }
-    transport->setName(d->ui.name->text().trimmed());
-    transport->forceUniqueName();
-    if (TransportManager::self()->configureTransport(transport, this)) {
-        // The user clicked OK and the transport settings were saved.
-        TransportManager::self()->addTransport(transport);
-        if (d->ui.setDefault->isChecked()) {
-            TransportManager::self()->setDefaultTransport(transport->id());
-        }
-        QDialog::accept();
-    }
-}
-
-#include "moc_addtransportdialog.cpp"
diff -Nru kmailtransport-16.12.3/src/addtransportdialog.h kmailtransport-17.04.3/src/addtransportdialog.h
--- kmailtransport-16.12.3/src/addtransportdialog.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/addtransportdialog.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,68 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_ADDTRANSPORTDIALOG_H
-#define MAILTRANSPORT_ADDTRANSPORTDIALOG_H
-
-#include <QDialog>
-
-namespace MailTransport
-{
-
-/**
-  @internal
-
-  A dialog for creating a new transport.  It asks the user for the transport
-  type and name, and then proceeds to configure the new transport.
-
-  To create a new transport from applications, use
-  TransportManager::showNewTransportDialog().
-
-  @author Constantin Berzan <exit3219@gmail.com>
-  @since 4.4
-*/
-class AddTransportDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    /**
-      Creates a new AddTransportDialog.
-    */
-    explicit AddTransportDialog(QWidget *parent = Q_NULLPTR);
-
-    /**
-      Destroys the AddTransportDialog.
-    */
-    virtual ~AddTransportDialog();
-
-    /* reimpl */
-    void accept() Q_DECL_OVERRIDE;
-
-private:
-    class Private;
-    Private *const d;
-
-    Q_PRIVATE_SLOT(d, void updateOkButton())
-    Q_PRIVATE_SLOT(d, void doubleClicked())
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_ADDTRANSPORTDIALOG_H
diff -Nru kmailtransport-16.12.3/src/attributeregistrar.cpp kmailtransport-17.04.3/src/attributeregistrar.cpp
--- kmailtransport-16.12.3/src/attributeregistrar.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/attributeregistrar.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,48 +0,0 @@
-/*
-  Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#include "dispatchmodeattribute.h"
-#include "errorattribute.h"
-#include "sentactionattribute.h"
-#include "sentbehaviourattribute.h"
-#include "transportattribute.h"
-
-#include <attributefactory.h>
-
-namespace
-{
-
-// Anonymous namespace; function is invisible outside this file.
-bool dummy()
-{
-    using namespace Akonadi;
-    using namespace MailTransport;
-    AttributeFactory::registerAttribute<DispatchModeAttribute>();
-    AttributeFactory::registerAttribute<ErrorAttribute>();
-    AttributeFactory::registerAttribute<SentActionAttribute>();
-    AttributeFactory::registerAttribute<SentBehaviourAttribute>();
-    AttributeFactory::registerAttribute<TransportAttribute>();
-    return true;
-}
-
-// Called when this library is loaded.
-const bool registered = dummy();
-
-} // namespace
-
diff -Nru kmailtransport-16.12.3/src/CMakeLists.txt kmailtransport-17.04.3/src/CMakeLists.txt
--- kmailtransport-16.12.3/src/CMakeLists.txt	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/CMakeLists.txt	2017-06-19 05:09:24.000000000 +0000
@@ -1,138 +1,7 @@
-
-
 add_definitions("-DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII")
 
 
-set(mailtransport_lib_srcs
-  transport.cpp
-  transportmanager.cpp
-  transporttype.cpp
-
-  transportcombobox.cpp
-  transportconfigwidget.cpp
-
-  filteractionjob.cpp
-  transportjob.cpp
-  resourcesendjob.cpp
-  smtpjob.cpp
-  precommandjob.cpp
-
-  legacydecrypt.cpp
-  socket.cpp
-  servertest.cpp
-
-  dispatcherinterface.cpp
-  messagequeuejob.cpp
-  outboxactions.cpp
-
-  attributeregistrar.cpp
-  dispatchmodeattribute.cpp
-  errorattribute.cpp
-  sentactionattribute.cpp
-  sentbehaviourattribute.cpp
-  transportattribute.cpp
-  transportconfigdialog.cpp
-  smtpconfigwidget.cpp
-
-  transportlistview.cpp
-  transportmanagementwidget.cpp
-  addtransportdialog.cpp
-)
-
-ecm_qt_declare_logging_category(mailtransport_lib_srcs HEADER mailtransport_debug.h IDENTIFIER MAILTRANSPORT_LOG CATEGORY_NAME org.kde.pim.mailtransport)
-
-ki18n_wrap_ui(mailtransport_lib_srcs
-  ui/addtransportdialog.ui
-  ui/transportmanagementwidget.ui
-  ui/smtpsettings.ui
-)
-
-kconfig_add_kcfg_files(mailtransport_lib_srcs transportbase.kcfgc)
-
-add_library(KF5MailTransport ${mailtransport_lib_srcs})
-
-generate_export_header(KF5MailTransport BASE_NAME mailtransport)
-
-add_library(KF5::MailTransport ALIAS KF5MailTransport)
-
-
-target_include_directories(KF5MailTransport INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/MailTransport;${KDE_INSTALL_INCLUDEDIR_KF5}/MailTransport/mailtransport>")
-target_include_directories(KF5MailTransport PUBLIC "$<BUILD_INTERFACE:${MailTransport_SOURCE_DIR}/src;${MailTransport_BINARY_DIR}/src>")
-
-
-target_link_libraries(KF5MailTransport
-PUBLIC
-                      KF5::Wallet
-                      KF5::AkonadiCore
-                      KF5::Mime
-                      KF5::AkonadiMime
-PRIVATE
-                      KF5::I18n 
-                      KF5::KIOCore
-                      KF5::ConfigGui
-                      KF5::WidgetsAddons
-                      KF5::CoreAddons
-                      KF5::Wallet
-                      KF5::ConfigWidgets
-                      Qt5::DBus
-                      Qt5::Network
-                      KF5::Completion
-)
-
-set_target_properties(KF5MailTransport PROPERTIES
-    VERSION ${MAILTRANSPORT_VERSION_STRING}
-    SOVERSION ${MAILTRANSPORT_SOVERSION}
-    EXPORT_NAME MailTransport
-)
-
-
-if(MAILTRANSPORT_INPROCESS_SMTP)
-  target_link_libraries(mailtransport ${Sasl2_LIBRARIES} KF5::PimUtils)
-endif()
-
-
-install(TARGETS KF5MailTransport EXPORT KF5MailTransportTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
-
-install(FILES mailtransport.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
-
+add_subdirectory(kmailtransport)
+add_subdirectory(kmailtransportakonadi)
 add_subdirectory(kcm)
 
-
-ecm_generate_headers(MailTransport_CamelCase_HEADERS
-  HEADER_NAMES
-  DispatcherInterface
-  DispatchModeAttribute
-  ErrorAttribute
-  MessageQueueJob
-  PrecommandJob
-  SentBehaviourAttribute
-  ServerTest
-  SmtpJob
-  Transport
-  TransportAttribute
-  #TransportBase
-  TransportComboBox
-  TransportJob
-  TransportManagementWidget
-  TransportManager
-  TransportType
-  PREFIX MailTransport
-  REQUIRED_HEADERS MailTransport_HEADERS
-)
-
-install(FILES
-  ${MailTransport_CamelCase_HEADERS}
-  DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/MailTransport/MailTransport/ COMPONENT Devel ) 
-
-install(FILES
-  ${CMAKE_CURRENT_BINARY_DIR}/mailtransport_export.h
-  ${MailTransport_HEADERS}
-  ${CMAKE_CURRENT_BINARY_DIR}/transportbase.h
-  sentactionattribute.h
-
-  DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/MailTransport/mailtransport COMPONENT Devel
-)
-
-ecm_generate_pri_file(BASE_NAME KMailTransport LIB_NAME KF5MailTransport DEPS "Wallet AkonadiCore Mime AkonadiMime" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/MailTransport/)
-install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
-
diff -Nru kmailtransport-16.12.3/src/dispatcherinterface.cpp kmailtransport-17.04.3/src/dispatcherinterface.cpp
--- kmailtransport-16.12.3/src/dispatcherinterface.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/dispatcherinterface.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,101 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "dispatcherinterface.h"
-#include "dispatcherinterface_p.h"
-
-#include "outboxactions_p.h"
-
-#include "mailtransport_debug.h"
-
-#include <agentmanager.h>
-#include <collection.h>
-#include <specialmailcollections.h>
-#include "transportattribute.h"
-
-using namespace Akonadi;
-using namespace MailTransport;
-
-Q_GLOBAL_STATIC(DispatcherInterfacePrivate, sInstance)
-
-void DispatcherInterfacePrivate::massModifyResult(KJob *job)
-{
-    // Nothing to do here, really.  If the job fails, the user can retry it.
-    if (job->error()) {
-        qCDebug(MAILTRANSPORT_LOG) << "failed" << job->errorString();
-    } else {
-        qCDebug(MAILTRANSPORT_LOG) << "succeeded.";
-    }
-}
-
-DispatcherInterface::DispatcherInterface()
-{
-}
-
-AgentInstance DispatcherInterface::dispatcherInstance() const
-{
-    AgentInstance a =
-        AgentManager::self()->instance(QStringLiteral("akonadi_maildispatcher_agent"));
-    if (!a.isValid()) {
-        qCWarning(MAILTRANSPORT_LOG) << "Could not get MDA instance.";
-    }
-    return a;
-}
-
-void DispatcherInterface::dispatchManually()
-{
-    Collection outbox =
-        SpecialMailCollections::self()->defaultCollection(SpecialMailCollections::Outbox);
-    if (!outbox.isValid()) {
-//    qCritical() << "Could not access Outbox.";
-        return;
-    }
-
-    FilterActionJob *mjob = new FilterActionJob(outbox, new SendQueuedAction, sInstance);
-    QObject::connect(mjob, &KJob::result, sInstance(), &DispatcherInterfacePrivate::massModifyResult);
-}
-
-void DispatcherInterface::retryDispatching()
-{
-    Collection outbox =
-        SpecialMailCollections::self()->defaultCollection(SpecialMailCollections::Outbox);
-    if (!outbox.isValid()) {
-//    qCritical() << "Could not access Outbox.";
-        return;
-    }
-
-    FilterActionJob *mjob = new FilterActionJob(outbox, new ClearErrorAction, sInstance);
-    QObject::connect(mjob, &KJob::result, sInstance(), &DispatcherInterfacePrivate::massModifyResult);
-}
-
-void DispatcherInterface::dispatchManualTransport(int transportId)
-{
-    Collection outbox =
-        SpecialMailCollections::self()->defaultCollection(SpecialMailCollections::Outbox);
-    if (!outbox.isValid()) {
-//    qCritical() << "Could not access Outbox.";
-        return;
-    }
-
-    FilterActionJob *mjob =
-        new FilterActionJob(outbox, new DispatchManualTransportAction(transportId), sInstance);
-    QObject::connect(mjob, &KJob::result, sInstance(), &DispatcherInterfacePrivate::massModifyResult);
-}
-
-#include "moc_dispatcherinterface_p.cpp"
diff -Nru kmailtransport-16.12.3/src/dispatcherinterface.h kmailtransport-17.04.3/src/dispatcherinterface.h
--- kmailtransport-16.12.3/src/dispatcherinterface.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/dispatcherinterface.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,83 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_DISPATCHERINTERFACE_H
-#define MAILTRANSPORT_DISPATCHERINTERFACE_H
-
-#include <mailtransport_export.h>
-
-#include <agentinstance.h>
-
-//krazy:excludeall=dpointer
-
-namespace MailTransport
-{
-
-/**
-  @short An interface for applications to interact with the dispatcher agent.
-
-  This class provides methods such as send queued messages (@see
-  dispatchManually) and retry sending (@see retryDispatching).
-
-  This class also takes care of registering the attributes that the mail
-  dispatcher agent and MailTransport use.
-
-  @author Constantin Berzan <exit3219@gmail.com>
-  @since 4.4
-*/
-class MAILTRANSPORT_EXPORT DispatcherInterface
-{
-public:
-
-    /**
-      Creates a new dispatcher interface.
-    */
-    DispatcherInterface();
-
-    /**
-      Returns the current instance of the mail dispatcher agent. May return an invalid
-      AgentInstance in case it cannot find the mail dispatcher agent.
-    */
-    Akonadi::AgentInstance dispatcherInstance() const;
-
-    /**
-      Looks for messages in the outbox with DispatchMode::Manual and marks them
-      DispatchMode::Automatic for sending.
-    */
-    void dispatchManually();
-
-    /**
-      Looks for messages in the outbox with ErrorAttribute, and clears them and
-      queues them again for sending.
-    */
-    void retryDispatching();
-
-    /**
-      Looks for messages in the outbox with DispatchMode::Manual and changes the
-      Transport for them to the one with id @p transportId.
-
-      @param transportId the transport to dispatch "manual dispatch" messages with
-      @since 4.5
-    */
-    void dispatchManualTransport(int transportId);
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_DISPATCHERINTERFACE_H
diff -Nru kmailtransport-16.12.3/src/dispatcherinterface_p.h kmailtransport-17.04.3/src/dispatcherinterface_p.h
--- kmailtransport-16.12.3/src/dispatcherinterface_p.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/dispatcherinterface_p.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-#ifndef MAILTRANSPORT_DISPATCHERINTERFACE_P_H
-#define MAILTRANSPORT_DISPATCHERINTERFACE_P_H
-
-#include <QtCore/QObject>
-
-class KJob;
-
-namespace MailTransport
-{
-
-/**
-  @internal
-*/
-class DispatcherInterfacePrivate : public QObject
-{
-    Q_OBJECT
-
-public:
-
-public Q_SLOTS:
-    void massModifyResult(KJob *job);
-
-};
-
-}
-
-#endif
diff -Nru kmailtransport-16.12.3/src/dispatchmodeattribute.cpp kmailtransport-17.04.3/src/dispatchmodeattribute.cpp
--- kmailtransport-16.12.3/src/dispatchmodeattribute.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/dispatchmodeattribute.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,112 +0,0 @@
-/*
-    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "dispatchmodeattribute.h"
-
-#include "mailtransport_debug.h"
-
-#include <attributefactory.h>
-
-using namespace Akonadi;
-using namespace MailTransport;
-
-class DispatchModeAttribute::Private
-{
-public:
-    DispatchMode mMode;
-    QDateTime mDueDate;
-};
-
-DispatchModeAttribute::DispatchModeAttribute(DispatchMode mode)
-    : d(new Private)
-{
-    d->mMode = mode;
-}
-
-DispatchModeAttribute::~DispatchModeAttribute()
-{
-    delete d;
-}
-
-DispatchModeAttribute *DispatchModeAttribute::clone() const
-{
-    DispatchModeAttribute *const cloned = new DispatchModeAttribute(d->mMode);
-    cloned->setSendAfter(d->mDueDate);
-    return cloned;
-}
-
-QByteArray DispatchModeAttribute::type() const
-{
-    static const QByteArray sType("DispatchModeAttribute");
-    return sType;
-}
-
-QByteArray DispatchModeAttribute::serialized() const
-{
-    switch (d->mMode) {
-    case Automatic: {
-        if (!d->mDueDate.isValid()) {
-            return "immediately";
-        } else {
-            return "after" + d->mDueDate.toString(Qt::ISODate).toLatin1();
-        }
-    }
-    case Manual: return "never";
-    }
-
-    Q_ASSERT(false);
-    return QByteArray(); // suppress control-reaches-end-of-non-void-function warning
-}
-
-void DispatchModeAttribute::deserialize(const QByteArray &data)
-{
-    d->mDueDate = QDateTime();
-    if (data == "immediately") {
-        d->mMode = Automatic;
-    } else if (data == "never") {
-        d->mMode = Manual;
-    } else if (data.startsWith(QByteArray("after"))) {
-        d->mMode = Automatic;
-        d->mDueDate = QDateTime::fromString(QString::fromLatin1(data.mid(5)), Qt::ISODate);
-        // NOTE: 5 is the strlen of "after".
-    } else {
-        qCWarning(MAILTRANSPORT_LOG) << "Failed to deserialize data [" << data << "]";
-    }
-}
-
-DispatchModeAttribute::DispatchMode DispatchModeAttribute::dispatchMode() const
-{
-    return d->mMode;
-}
-
-void DispatchModeAttribute::setDispatchMode(DispatchMode mode)
-{
-    d->mMode = mode;
-}
-
-QDateTime DispatchModeAttribute::sendAfter() const
-{
-    return d->mDueDate;
-}
-
-void DispatchModeAttribute::setSendAfter(const QDateTime &date)
-{
-    d->mDueDate = date;
-}
-
diff -Nru kmailtransport-16.12.3/src/dispatchmodeattribute.h kmailtransport-17.04.3/src/dispatchmodeattribute.h
--- kmailtransport-16.12.3/src/dispatchmodeattribute.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/dispatchmodeattribute.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,102 +0,0 @@
-/*
-    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_DISPATCHMODEATTRIBUTE_H
-#define MAILTRANSPORT_DISPATCHMODEATTRIBUTE_H
-
-#include <mailtransport_export.h>
-
-#include <QtCore/QDateTime>
-
-#include <attribute.h>
-
-namespace MailTransport
-{
-
-/**
-  Attribute determining how and when a message from the outbox should be
-  dispatched.  Messages can be sent immediately, sent only when the user
-  explicitly requests it, or sent automatically at a certain date and time.
-
-  @author Constantin Berzan <exit3219@gmail.com>
-  @since 4.4
-*/
-class MAILTRANSPORT_EXPORT DispatchModeAttribute : public Akonadi::Attribute
-{
-public:
-    /**
-      Determines how the message is sent.
-    */
-    enum DispatchMode {
-        Automatic,    ///< Send message as soon as possible, but no earlier than
-        ///  specified by setSendAfter()
-        Manual        ///< Send message only when the user requests so.
-    };
-
-    /**
-      Creates a new DispatchModeAttribute.
-    */
-    explicit DispatchModeAttribute(DispatchMode mode = Automatic);
-
-    /**
-      Destroys the DispatchModeAttribute.
-    */
-    virtual ~DispatchModeAttribute();
-
-    /* reimpl */
-    DispatchModeAttribute *clone() const Q_DECL_OVERRIDE;
-    QByteArray type() const Q_DECL_OVERRIDE;
-    QByteArray serialized() const Q_DECL_OVERRIDE;
-    void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
-
-    /**
-      Returns the dispatch mode for the message.
-      @see DispatchMode.
-    */
-    DispatchMode dispatchMode() const;
-
-    /**
-      Sets the dispatch mode for the message.
-      @param mode the dispatch mode to set
-      @see DispatchMode.
-    */
-    void setDispatchMode(DispatchMode mode);
-
-    /**
-      Returns the date and time when the message should be sent.
-      Only valid if dispatchMode() is Automatic.
-    */
-    QDateTime sendAfter() const;
-
-    /**
-      Sets the date and time when the message should be sent.
-      @param date the date and time to set
-      @see setDispatchMode.
-    */
-    void setSendAfter(const QDateTime &date);
-
-private:
-    class Private;
-    Private *const d;
-
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_DISPATCHMODEATTRIBUTE_H
diff -Nru kmailtransport-16.12.3/src/errorattribute.cpp kmailtransport-17.04.3/src/errorattribute.cpp
--- kmailtransport-16.12.3/src/errorattribute.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/errorattribute.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-/*
-    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "errorattribute.h"
-
-using namespace Akonadi;
-using namespace MailTransport;
-
-class ErrorAttribute::Private
-{
-public:
-    QString mMessage;
-};
-
-ErrorAttribute::ErrorAttribute(const QString &msg)
-    : d(new Private)
-{
-    d->mMessage = msg;
-}
-
-ErrorAttribute::~ErrorAttribute()
-{
-    delete d;
-}
-
-ErrorAttribute *ErrorAttribute::clone() const
-{
-    return new ErrorAttribute(d->mMessage);
-}
-
-QByteArray ErrorAttribute::type() const
-{
-    static const QByteArray sType("ErrorAttribute");
-    return sType;
-}
-
-QByteArray ErrorAttribute::serialized() const
-{
-    return d->mMessage.toUtf8();
-}
-
-void ErrorAttribute::deserialize(const QByteArray &data)
-{
-    d->mMessage = QString::fromUtf8(data);
-}
-
-QString ErrorAttribute::message() const
-{
-    return d->mMessage;
-}
-
-void ErrorAttribute::setMessage(const QString &msg)
-{
-    d->mMessage = msg;
-}
-
diff -Nru kmailtransport-16.12.3/src/errorattribute.h kmailtransport-17.04.3/src/errorattribute.h
--- kmailtransport-16.12.3/src/errorattribute.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/errorattribute.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,80 +0,0 @@
-/*
-    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_ERRORATTRIBUTE_H
-#define MAILTRANSPORT_ERRORATTRIBUTE_H
-
-#include <mailtransport_export.h>
-
-#include <QtCore/QString>
-
-#include <attribute.h>
-
-namespace MailTransport
-{
-
-/**
- * @short An Attribute to mark messages that failed to be sent.
- *
- * This attribute contains the error message encountered.
- *
- * @author Constantin Berzan <exit3219@gmail.com>
- * @since 4.4
- */
-class MAILTRANSPORT_EXPORT ErrorAttribute : public Akonadi::Attribute
-{
-public:
-    /**
-     * Creates a new error attribute.
-     *
-     * @param msg The i18n'ed error message.
-     */
-    explicit ErrorAttribute(const QString &msg = QString());
-
-    /**
-     * Destroys the error attribute.
-     */
-    virtual ~ErrorAttribute();
-
-    /**
-     * Returns the i18n'ed error message.
-     */
-    QString message() const;
-
-    /**
-     * Sets the i18n'ed error message.
-     */
-    void setMessage(const QString &msg);
-
-    /* reimpl */
-    ErrorAttribute *clone() const Q_DECL_OVERRIDE;
-    QByteArray type() const Q_DECL_OVERRIDE;
-    QByteArray serialized() const Q_DECL_OVERRIDE;
-    void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
-
-private:
-    //@cond PRIVATE
-    class Private;
-    Private *const d;
-    //@endcond
-};
-
-}
-
-#endif
diff -Nru kmailtransport-16.12.3/src/filteractionjob.cpp kmailtransport-17.04.3/src/filteractionjob.cpp
--- kmailtransport-16.12.3/src/filteractionjob.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/filteractionjob.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,133 +0,0 @@
-/*
-  Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#include "filteractionjob_p.h"
-
-#include <collection.h>
-#include <itemfetchjob.h>
-#include <itemfetchscope.h>
-
-#include "mailtransport_debug.h"
-
-using namespace Akonadi;
-
-class Q_DECL_HIDDEN Akonadi::FilterActionJob::Private
-{
-public:
-    Private(FilterActionJob *qq)
-        : q(qq), functor(Q_NULLPTR)
-    {
-    }
-
-    ~Private()
-    {
-        delete functor;
-    }
-
-    FilterActionJob *q;
-    Collection collection;
-    Item::List items;
-    FilterAction *functor;
-    ItemFetchScope fetchScope;
-
-    // Q_SLOTS:
-    void fetchResult(KJob *job);
-
-    void traverseItems();
-};
-
-void FilterActionJob::Private::fetchResult(KJob *job)
-{
-    if (job->error()) {
-        // KCompositeJob takes care of errors.
-        return;
-    }
-
-    ItemFetchJob *fjob = dynamic_cast<ItemFetchJob *>(job);
-    Q_ASSERT(fjob);
-    Q_ASSERT(items.isEmpty());
-    items = fjob->items();
-    traverseItems();
-}
-
-void FilterActionJob::Private::traverseItems()
-{
-    Q_ASSERT(functor);
-    qCDebug(MAILTRANSPORT_LOG) << "Traversing" << items.count() << "items.";
-    foreach (const Item &item, items) {
-        if (functor->itemAccepted(item)) {
-            functor->itemAction(item, q);
-            qCDebug(MAILTRANSPORT_LOG) << "Added subjob for item" << item.id();
-        }
-    }
-    if (q->subjobs().isEmpty()) {
-        qCDebug(MAILTRANSPORT_LOG) << "No subjobs; I am done";
-    } else {
-        qCDebug(MAILTRANSPORT_LOG) << "Have subjobs; Done when last of them is";
-    }
-    q->commit();
-}
-
-FilterAction::~FilterAction()
-{
-}
-
-FilterActionJob::FilterActionJob(const Item &item, FilterAction *functor, QObject *parent)
-    : TransactionSequence(parent), d(new Private(this))
-{
-    d->functor = functor;
-    d->items << item;
-}
-
-FilterActionJob::FilterActionJob(const Item::List &items, FilterAction *functor, QObject *parent)
-    : TransactionSequence(parent), d(new Private(this))
-{
-    d->functor = functor;
-    d->items = items;
-}
-
-FilterActionJob::FilterActionJob(const Collection &collection,
-                                 FilterAction *functor, QObject *parent)
-    : TransactionSequence(parent), d(new Private(this))
-{
-    d->functor = functor;
-    Q_ASSERT(collection.isValid());
-    d->collection = collection;
-}
-
-FilterActionJob::~FilterActionJob()
-{
-    delete d;
-}
-
-void FilterActionJob::doStart()
-{
-    if (d->collection.isValid()) {
-        qCDebug(MAILTRANSPORT_LOG) << "Fetching collection" << d->collection.id();
-        ItemFetchJob *fjob = new ItemFetchJob(d->collection, this);
-        Q_ASSERT(d->functor);
-        d->fetchScope = d->functor->fetchScope();
-        fjob->setFetchScope(d->fetchScope);
-        connect(fjob, SIGNAL(result(KJob*)), this, SLOT(fetchResult(KJob*)));
-    } else {
-        d->traverseItems();
-    }
-}
-
-#include "moc_filteractionjob_p.cpp"
diff -Nru kmailtransport-16.12.3/src/filteractionjob_p.h kmailtransport-17.04.3/src/filteractionjob_p.h
--- kmailtransport-16.12.3/src/filteractionjob_p.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/filteractionjob_p.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,184 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_FILTERACTIONJOB_P_H
-#define MAILTRANSPORT_FILTERACTIONJOB_P_H
-
-#include <mailtransport_export.h>
-
-#include <item.h>
-#include <transactionsequence.h>
-
-namespace Akonadi
-{
-
-class Collection;
-class ItemFetchScope;
-class Job;
-
-class FilterActionJob;
-
-/**
- * @short Base class for a filter/action for FilterActionJob.
- *
- * Abstract class defining an interface for a filter and an action for
- * FilterActionJob.  The virtual methods must be implemented in subclasses.
- *
- * @code
- * class ClearErrorAction : public Akonadi::FilterAction
- * {
- *   public:
- *     // reimpl
- *     virtual Akonadi::ItemFetchScope fetchScope() const
- *     {
- *       ItemFetchScope scope;
- *       scope.fetchFullPayload( false );
- *       scope.fetchAttribute<ErrorAttribute>();
- *       return scope;
- *     }
- *
- *     virtual bool itemAccepted( const Akonadi::Item &item ) const
- *     {
- *       return item.hasAttribute<ErrorAttribute>();
- *     }
- *
- *     virtual Akonadi::Job *itemAction( const Akonadi::Item &item,
- *                                       Akonadi::FilterActionJob *parent ) const
- *     {
- *       Item cp = item;
- *       cp.removeAttribute<ErrorAttribute>();
- *       return new ItemModifyJob( cp, parent );
- *     }
- * };
- * @endcode
- *
- * @see FilterActionJob
- *
- * @author Constantin Berzan <exit3219@gmail.com>
- * @since 4.4
- */
-class MAILTRANSPORT_EXPORT FilterAction
-{
-public:
-    /**
-     * Destroys this filter action.
-     *
-     * A FilterActionJob will delete its FilterAction automatically.
-     */
-    virtual ~FilterAction();
-
-    /**
-     * Returns an ItemFetchScope to use if the FilterActionJob needs
-     * to fetch the items from a collection.
-     *
-     * @note The items are not fetched unless FilterActionJob is
-     *       constructed with a Collection parameter.
-     */
-    virtual Akonadi::ItemFetchScope fetchScope() const = 0;
-
-    /**
-     * Returns @c true if the @p item is accepted by the filter and should be
-     * acted upon by the FilterActionJob.
-     */
-    virtual bool itemAccepted(const Akonadi::Item &item) const = 0;
-
-    /**
-     * Returns a job to act on the @p item.
-     * The FilterActionJob will finish when all such jobs are finished.
-     * @param item the item to work on
-     * @param parent the parent job
-     */
-    virtual Akonadi::Job *itemAction(const Akonadi::Item &item,
-                                     Akonadi::FilterActionJob *parent) const = 0;
-};
-
-/**
- * @short Job to filter and apply an action on a set of items.
- *
- * This jobs filters through a set of items, and applies an action to the
- * items which are accepted by the filter.  The filter and action
- * are provided by a functor class derived from FilterAction.
- *
- * For example, a MarkAsRead action/filter may be used to mark all messages
- * in a folder as read.
- *
- * @code
- * FilterActionJob *mjob = new FilterActionJob( LocalFolders::self()->outbox(),
- *                                              new ClearErrorAction, this );
- * connect( mjob, SIGNAL( result( KJob* ) ), this, SLOT( massModifyResult( KJob* ) ) );
- * @endcode
- *
- * @see FilterAction
- *
- * @author Constantin Berzan <exit3219@gmail.com>
- * @since 4.4
- */
-class MAILTRANSPORT_EXPORT FilterActionJob : public TransactionSequence
-{
-    Q_OBJECT
-
-public:
-    /**
-     * Creates a filter action job to act on a single item.
-     *
-     * @param item The item to act on. The item is not re-fetched.
-     * @param functor The FilterAction to use.
-     * @param parent The parent object.
-     */
-    FilterActionJob(const Item &item, FilterAction *functor, QObject *parent = Q_NULLPTR);
-
-    /**
-     * Creates a filter action job to act on a set of items.
-     *
-     * @param items The items to act on. The items are not re-fetched.
-     * @param functor The FilterAction to use.
-     * @param parent The parent object.
-     */
-    FilterActionJob(const Item::List &items, FilterAction *functor, QObject *parent = Q_NULLPTR);
-
-    /**
-     * Creates a filter action job to act on items in a collection.
-     *
-     * @param collection The collection to act on.
-     *                   The items of the collection are fetched using functor->fetchScope().
-     * @param functor The FilterAction to use.
-     * @param parent The parent object.
-     */
-    FilterActionJob(const Collection &collection, FilterAction *functor, QObject *parent = Q_NULLPTR);
-
-    /**
-     * Destroys the filter action job.
-     */
-    ~FilterActionJob();
-
-protected:
-    void doStart() Q_DECL_OVERRIDE;
-
-private:
-    //@cond PRIVATE
-    class Private;
-    Private *const d;
-
-    Q_PRIVATE_SLOT(d, void fetchResult(KJob *))
-    //@endcond
-};
-
-} // namespace Akonadi
-
-#endif // AKONADI_FILTERACTIONJOB_H
diff -Nru kmailtransport-16.12.3/src/helper_p.h kmailtransport-17.04.3/src/helper_p.h
--- kmailtransport-16.12.3/src/helper_p.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/helper_p.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,94 @@
+/*
+    Copyright (c) 2017 Laurent Montel <montel@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef _HELPER_H
+#define _HELPER_H
+#include <qglobal.h>
+
+#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
+template<typename ... Args>
+struct QNonConstOverload
+{
+    template<typename R, typename T>
+    Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args ...)) const Q_DECL_NOTHROW->decltype(ptr)
+    {
+        return ptr;
+    }
+
+    template<typename R, typename T>
+    static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args ...)) Q_DECL_NOTHROW->decltype(ptr)
+    {
+        return ptr;
+    }
+};
+
+template<typename ... Args>
+struct QConstOverload
+{
+    template<typename R, typename T>
+    Q_DECL_CONSTEXPR auto operator()(R (T::*ptr)(Args ...) const) const Q_DECL_NOTHROW->decltype(ptr)
+    {
+        return ptr;
+    }
+
+    template<typename R, typename T>
+    static Q_DECL_CONSTEXPR auto of(R (T::*ptr)(Args ...) const) Q_DECL_NOTHROW->decltype(ptr)
+    {
+        return ptr;
+    }
+};
+
+template<typename ... Args>
+struct QOverload : QConstOverload<Args ...>, QNonConstOverload<Args ...>
+{
+    using QConstOverload<Args ...>::of;
+    using QConstOverload<Args ...>::operator();
+    using QNonConstOverload<Args ...>::of;
+    using QNonConstOverload<Args ...>::operator();
+
+    template<typename R>
+    Q_DECL_CONSTEXPR auto operator()(R (*ptr)(Args ...)) const Q_DECL_NOTHROW->decltype(ptr)
+    {
+        return ptr;
+    }
+
+    template<typename R>
+    static Q_DECL_CONSTEXPR auto of(R (*ptr)(Args ...)) Q_DECL_NOTHROW->decltype(ptr)
+    {
+        return ptr;
+    }
+};
+
+namespace QtPrivate {
+template<typename T> struct QAddConst {
+    typedef const T Type;
+};
+}
+
+// this adds const to non-const objects (like std::as_const)
+template<typename T>
+Q_DECL_CONSTEXPR typename QtPrivate::QAddConst<T>::Type &qAsConst(T &t) Q_DECL_NOTHROW {
+    return t;
+}
+// prevent rvalue arguments:
+template<typename T>
+void qAsConst(const T &&) Q_DECL_EQ_DELETE;
+#endif
+
+#endif
diff -Nru kmailtransport-16.12.3/src/kcm/configmodule.cpp kmailtransport-17.04.3/src/kcm/configmodule.cpp
--- kmailtransport-16.12.3/src/kcm/configmodule.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/kcm/configmodule.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -18,7 +18,7 @@
 */
 
 #include "configmodule.h"
-#include "transportmanagementwidget.h"
+#include "widgets/transportmanagementwidget.h"
 
 #include <KPluginFactory>
 #include <KPluginLoader>
@@ -27,15 +27,17 @@
 
 using namespace MailTransport;
 
-K_PLUGIN_FACTORY(MailTransportConfigFactory, registerPlugin<ConfigModule>();)
+K_PLUGIN_FACTORY(MailTransportConfigFactory, registerPlugin<ConfigModule>();
+                 )
 
-ConfigModule::ConfigModule(QWidget *parent, const QVariantList &args) :
-    KCModule(parent, args)
+ConfigModule::ConfigModule(QWidget *parent, const QVariantList &args)
+    : KCModule(parent, args)
 {
-    setButtons(Q_NULLPTR);
+    setButtons(nullptr);
     QVBoxLayout *l = new QVBoxLayout(this);
     l->setMargin(0);
     TransportManagementWidget *tmw = new TransportManagementWidget(this);
     l->addWidget(tmw);
 }
+
 #include "configmodule.moc"
diff -Nru kmailtransport-16.12.3/src/kcm/configmodule.h kmailtransport-17.04.3/src/kcm/configmodule.h
--- kmailtransport-16.12.3/src/kcm/configmodule.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/kcm/configmodule.h	2017-06-19 05:09:24.000000000 +0000
@@ -22,9 +22,7 @@
 
 #include <KCModule>
 
-namespace MailTransport
-{
-
+namespace MailTransport {
 /**
   KCModule for transport management.
 */
@@ -32,10 +30,8 @@
 {
     Q_OBJECT
 public:
-    explicit ConfigModule(QWidget *parent = Q_NULLPTR,
-                          const QVariantList &args = QVariantList());
+    explicit ConfigModule(QWidget *parent = nullptr, const QVariantList &args = QVariantList());
 };
-
 } // namespace MailTransport
 
 #endif // MAILTRANSPORT_CONFIGMODULE_H
diff -Nru kmailtransport-16.12.3/src/kcm/kcm_mailtransport.desktop kmailtransport-17.04.3/src/kcm/kcm_mailtransport.desktop
--- kmailtransport-16.12.3/src/kcm/kcm_mailtransport.desktop	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/kcm/kcm_mailtransport.desktop	2017-06-19 05:09:24.000000000 +0000
@@ -13,7 +13,6 @@
 
 Name=Mail Transport
 Name[ar]=نقل البريد
-Name[ast]=Tresporte de corréu
 Name[be]=Паштовы транспарт
 Name[bs]=Transport pošte
 Name[ca]=Transport de correu
diff -Nru kmailtransport-16.12.3/src/kmailtransport/CMakeLists.txt kmailtransport-17.04.3/src/kmailtransport/CMakeLists.txt
--- kmailtransport-16.12.3/src/kmailtransport/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/CMakeLists.txt	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,143 @@
+ecm_setup_version(PROJECT VARIABLE_PREFIX MAILTRANSPORT
+    VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/mailtransport_version.h"
+    PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5MailTransportConfigVersion.cmake"
+    SOVERSION 5
+    )
+
+set(mailtransport_lib_srcs
+    transport.cpp
+    transportmanager.cpp
+    transporttype.cpp
+    transportjob.cpp
+    smtpjob.cpp
+    precommandjob.cpp
+    socket.cpp
+    servertest.cpp
+    )
+
+set(mailtransport_widgets_srcs
+    widgets/transportconfigwidget.cpp
+    widgets/addtransportdialog.cpp
+    widgets/transportcombobox.cpp
+    widgets/transportlistview.cpp
+    widgets/transportmanagementwidget.cpp
+    widgets/transportconfigdialog.cpp
+    widgets/smtpconfigwidget.cpp
+    )
+
+ecm_qt_declare_logging_category(mailtransport_lib_srcs HEADER mailtransport_debug.h IDENTIFIER MAILTRANSPORT_LOG CATEGORY_NAME org.kde.pim.mailtransport)
+
+ki18n_wrap_ui(mailtransport_lib_srcs
+    ui/addtransportdialog.ui
+    ui/transportmanagementwidget.ui
+    ui/smtpsettings.ui
+    )
+
+kconfig_add_kcfg_files(mailtransport_lib_srcs transportbase.kcfgc)
+
+add_library(KF5MailTransport
+    ${mailtransport_lib_srcs}
+    ${mailtransport_widgets_srcs}
+    )
+
+generate_export_header(KF5MailTransport BASE_NAME mailtransport)
+
+add_library(KF5::MailTransport ALIAS KF5MailTransport)
+
+target_include_directories(KF5MailTransport INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/MailTransport;${KDE_INSTALL_INCLUDEDIR_KF5}/mailtransport>")
+target_include_directories(KF5MailTransport PUBLIC "$<BUILD_INTERFACE:${MailTransport_SOURCE_DIR}/src;${MailTransport_BINARY_DIR}/src>")
+
+target_link_libraries(KF5MailTransport
+    PUBLIC
+    KF5::Wallet
+    PRIVATE
+    KF5::I18n
+    KF5::KIOCore
+    KF5::ConfigGui
+    KF5::WidgetsAddons
+    KF5::CoreAddons
+    KF5::Wallet
+    KF5::ConfigWidgets
+    Qt5::DBus
+    Qt5::Network
+    KF5::Completion
+    )
+
+set_target_properties(KF5MailTransport PROPERTIES
+    VERSION ${MAILTRANSPORT_VERSION_STRING}
+    SOVERSION ${MAILTRANSPORT_SOVERSION}
+    EXPORT_NAME MailTransport
+    )
+
+
+install(TARGETS KF5MailTransport EXPORT KF5MailTransportTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+
+install(FILES mailtransport.kcfg DESTINATION ${KDE_INSTALL_KCFGDIR})
+
+
+ecm_generate_headers(MailTransport_CamelCase_HEADERS
+    HEADER_NAMES
+    PrecommandJob
+    ServerTest
+    SmtpJob
+    Transport
+    TransportJob
+    TransportManager
+    TransportType
+    PREFIX MailTransport
+    REQUIRED_HEADERS MailTransport_HEADERS
+    )
+
+ecm_generate_headers(MailTransport_widgets_CamelCase_HEADERS
+    HEADER_NAMES
+    TransportComboBox
+    TransportManagementWidget
+    PREFIX MailTransport
+    REQUIRED_HEADERS MailTransport_widgets_HEADERS
+    RELATIVE widgets
+    )
+
+install(FILES
+    ${MailTransport_CamelCase_HEADERS}
+    ${MailTransport_widgets_CamelCase_HEADERS}
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/MailTransport/ COMPONENT Devel )
+
+install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/mailtransport_export.h
+    ${MailTransport_HEADERS}
+    ${MailTransport_widgets_HEADERS}
+    ${CMAKE_CURRENT_BINARY_DIR}/transportbase.h
+
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/mailtransport COMPONENT Devel
+    )
+
+ecm_generate_pri_file(BASE_NAME KMailTransport LIB_NAME KF5MailTransport DEPS "Wallet" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/MailTransport/)
+install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
+
+
+set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailTransport")
+
+configure_package_config_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/KF5MailTransportConfig.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/KF5MailTransportConfig.cmake"
+    INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
+    )
+
+install(FILES
+    "${CMAKE_CURRENT_BINARY_DIR}/KF5MailTransportConfig.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/KF5MailTransportConfigVersion.cmake"
+    DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+    COMPONENT Devel
+    )
+
+install(EXPORT KF5MailTransportTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5MailTransportTargets.cmake NAMESPACE KF5::)
+
+install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/mailtransport_version.h
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
+    )
+
+
+if(BUILD_TESTING)
+    add_subdirectory(tests)
+endif()
diff -Nru kmailtransport-16.12.3/src/kmailtransport/KF5MailTransportConfig.cmake.in kmailtransport-17.04.3/src/kmailtransport/KF5MailTransportConfig.cmake.in
--- kmailtransport-16.12.3/src/kmailtransport/KF5MailTransportConfig.cmake.in	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/KF5MailTransportConfig.cmake.in	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,15 @@
+@PACKAGE_INIT@
+
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_MODULE_PATH})
+include(CMakeFindDependencyMacro)
+find_dependency(KF5Wallet "@KF5_VERSION@")
+
+find_dependency(Sasl2)
+
+include(FeatureSummary)
+set_package_properties(Sasl2 PROPERTIES
+                             DESCRIPTION "The Cyrus-sasl library"
+                             URL "http://www.cyrussasl.org"
+)
+
+include("${CMAKE_CURRENT_LIST_DIR}/KF5MailTransportTargets.cmake")
diff -Nru kmailtransport-16.12.3/src/kmailtransport/mailtransport_defs.h kmailtransport-17.04.3/src/kmailtransport/mailtransport_defs.h
--- kmailtransport-16.12.3/src/kmailtransport/mailtransport_defs.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/mailtransport_defs.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,57 @@
+/*
+    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_MAILTRANSPORT_DEFS_H
+#define MAILTRANSPORT_MAILTRANSPORT_DEFS_H
+
+/**
+  @file mailtransport_defs.h
+  Internal file containing constant definitions etc.
+*/
+
+#define WALLET_FOLDER QStringLiteral("mailtransports")
+#define KMAIL_WALLET_FOLDER QStringLiteral("kmail")
+
+#define DBUS_SERVICE_NAME QStringLiteral("org.kde.pim.TransportManager")
+#define DBUS_INTERFACE_NAME QStringLiteral("org.kde.pim.TransportManager")
+#define DBUS_OBJECT_PATH QStringLiteral("/TransportManager")
+#define DBUS_CHANGE_SIGNAL QStringLiteral("changesCommitted")
+
+#define SMTP_PROTOCOL QStringLiteral("smtp")
+#define SMTPS_PROTOCOL QStringLiteral("smtps")
+
+#define SMTP_PORT 25
+#define SMTPS_PORT 465
+
+// Because ServerTest is also capable of testing IMAP,
+// some additional defines:
+
+#define IMAP_PROTOCOL QStringLiteral("imap")
+#define IMAPS_PROTOCOL QStringLiteral("imaps")
+
+#define POP_PROTOCOL QStringLiteral("pop")
+#define POPS_PROTOCOL QStringLiteral("pops")
+
+#define IMAP_PORT 143
+#define IMAPS_PORT 993
+
+#define POP_PORT 110
+#define POPS_PORT 995
+
+#endif
diff -Nru kmailtransport-16.12.3/src/kmailtransport/mailtransport.kcfg kmailtransport-17.04.3/src/kmailtransport/mailtransport.kcfg
--- kmailtransport-16.12.3/src/kmailtransport/mailtransport.kcfg	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/mailtransport.kcfg	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
+      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+  <kcfgfile name="mailtransports">
+    <parameter name="transportId" />
+  </kcfgfile>
+
+  <group name="Transport $(transportId)">
+    <entry name="id" type="Int">
+      <label>Unique identifier</label>
+      <default>0</default>
+    </entry>
+    <entry name="name" type="String">
+      <label>User-visible transport name</label>
+      <whatsthis>The name that will be used when referring to this server.</whatsthis>
+      <default code="true">i18n("Unnamed")</default>
+    </entry>
+    <entry name="type" type="Enum">
+      <choices>
+        <choice name="SMTP">
+          <label>SMTP Server</label>
+        </choice>
+        <choice name="Akonadi">
+          <label>Akonadi Resource</label>
+        </choice>
+      </choices>
+      <label>Transport type</label>
+      <default>SMTP</default>
+    </entry>
+    <entry name="host" type="String">
+      <label>Host name of the server</label>
+      <whatsthis>The domain name or numerical address of the SMTP server.</whatsthis>
+    </entry>
+    <entry name="port" type="UInt">
+      <label>Port number of the server</label>
+      <whatsthis>The port number that the SMTP server is listening on. The default port is 25.</whatsthis>
+      <default>25</default>
+    </entry>
+    <entry name="userName" type="String" key="user">
+      <label>User name needed for login</label>
+      <whatsthis>The user name to send to the server for authorization.</whatsthis>
+    </entry>
+    <entry name="precommand" type="String">
+      <label>Command to execute before sending a mail</label>
+      <whatsthis>A command to run locally, prior to sending email. This can be used to set up SSH tunnels, for example. Leave it empty if no command should be run.</whatsthis>
+    </entry>
+    <entry name="requiresAuthentication" type="Bool" key="auth">
+      <label>Server requires authentication</label>
+      <whatsthis>Check this option if your SMTP server requires authentication before accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP.</whatsthis>
+      <default>false</default>
+    </entry>
+    <entry name="storePassword" type="Bool" key="storepass">
+      <label>Store password</label>
+      <whatsthis>Check this option to have your password stored.
+If KWallet is available the password will be stored there, which is considered safe.
+However, if KWallet is not available, the password will be stored in the configuration file. The password is stored in an obfuscated format, but should not be considered secure from decryption efforts if access to the configuration file is obtained.</whatsthis>
+      <default>false</default>
+    </entry>
+    <entry name="encryption" type="Enum">
+      <label>Encryption method used for communication</label>
+      <choices>
+        <choice name="None">
+          <label>No encryption</label>
+        </choice>
+        <choice name="SSL">
+          <label>SSL encryption</label>
+        </choice>
+        <choice name="TLS">
+          <label>TLS encryption</label>
+        </choice>
+      </choices>
+    </entry>
+    <entry name="authenticationType" type="Enum" key="authtype">
+      <label>Authentication method</label>
+      <choices>
+        <!-- TODO - -> _ conversion? -->
+        <choice name="LOGIN"/>
+        <choice name="PLAIN"/>
+        <choice name="CRAM_MD5"/>
+        <choice name="DIGEST_MD5"/>
+        <choice name="GSSAPI"/>
+        <choice name="NTLM"/>
+        <choice name="APOP" />
+        <choice name="CLEAR" />
+        <choice name="ANONYMOUS" />
+        <choice name="XOAUTH2" />
+      </choices>
+      <default>PLAIN</default>
+    </entry>
+    <entry name="specifyHostname" type="Bool">
+      <label><!-- TODO --></label>
+      <whatsthis>Check this option to use a custom hostname when identifying to the mail server. This is useful when your system's hostname may not be set correctly or to mask your system's true hostname.</whatsthis>
+      <default>false</default>
+    </entry>
+    <entry name="localHostname" type="String">
+      <label><!-- TODO --></label>
+      <whatsthis>Enter the hostname that should be used when identifying to the server.</whatsthis>
+    </entry>
+    <entry name="specifySenderOverwriteAddress" type="Bool">
+      <label><!-- TODO --></label>
+      <whatsthis>Check this option to use a custom sender address when identifying to the mail server. If not checked, the address from the identity is used.</whatsthis>
+      <default>false</default>
+    </entry>
+    <entry name="senderOverwriteAddress" type="String">
+      <label><!-- TODO --></label>
+      <whatsthis>Enter the address that should be used to overwrite the default sender address.</whatsthis>
+    </entry>
+  </group>
+
+</kcfg>
diff -Nru kmailtransport-16.12.3/src/kmailtransport/precommandjob.cpp kmailtransport-17.04.3/src/kmailtransport/precommandjob.cpp
--- kmailtransport-16.12.3/src/kmailtransport/precommandjob.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/precommandjob.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,116 @@
+/*
+    Copyright (c) 2007 Volker Krause <vkrause@kde.org>
+
+    Based on KMail code by:
+    Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
+    Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "precommandjob.h"
+
+#include <KLocalizedString>
+
+#include <QProcess>
+
+using namespace MailTransport;
+
+/**
+ * Private class that helps to provide binary compatibility between releases.
+ * @internal
+ */
+class PreCommandJobPrivate
+{
+public:
+    PreCommandJobPrivate(PrecommandJob *parent);
+    QProcess *process;
+    QString precommand;
+    PrecommandJob *q;
+
+    // Slots
+    void slotFinished(int, QProcess::ExitStatus);
+    void slotStarted();
+    void slotError(QProcess::ProcessError error);
+};
+
+PreCommandJobPrivate::PreCommandJobPrivate(PrecommandJob *parent)
+    : process(nullptr)
+    , q(parent)
+{
+}
+
+PrecommandJob::PrecommandJob(const QString &precommand, QObject *parent)
+    : KJob(parent)
+    , d(new PreCommandJobPrivate(this))
+{
+    d->precommand = precommand;
+    d->process = new QProcess(this);
+    connect(d->process, SIGNAL(started()), SLOT(slotStarted()));
+    connect(d->process, SIGNAL(error(QProcess::ProcessError)),
+            SLOT(slotError(QProcess::ProcessError)));
+    connect(d->process, SIGNAL(finished(int,QProcess::ExitStatus)),
+            SLOT(slotFinished(int,QProcess::ExitStatus)));
+}
+
+PrecommandJob::~PrecommandJob()
+{
+    delete d;
+}
+
+void PrecommandJob::start()
+{
+    d->process->start(d->precommand);
+}
+
+void PreCommandJobPrivate::slotStarted()
+{
+    emit q->infoMessage(q, i18n("Executing precommand"),
+                        i18n("Executing precommand '%1'.", precommand));
+}
+
+void PreCommandJobPrivate::slotError(QProcess::ProcessError error)
+{
+    q->setError(KJob::UserDefinedError);
+    if (error == QProcess::FailedToStart) {
+        q->setErrorText(i18n("Unable to start precommand '%1'.", precommand));
+    } else {
+        q->setErrorText(i18n("Error while executing precommand '%1'.", precommand));
+    }
+    q->emitResult();
+}
+
+bool PrecommandJob::doKill()
+{
+    delete d->process;
+    d->process = nullptr;
+    return true;
+}
+
+void PreCommandJobPrivate::slotFinished(int exitCode, QProcess::ExitStatus exitStatus)
+{
+    if (exitStatus == QProcess::CrashExit) {
+        q->setError(KJob::UserDefinedError);
+        q->setErrorText(i18n("The precommand crashed."));
+    } else if (exitCode != 0) {
+        q->setError(KJob::UserDefinedError);
+        q->setErrorText(i18n("The precommand exited with code %1.",
+                             process->exitStatus()));
+    }
+    q->emitResult();
+}
+
+#include "moc_precommandjob.cpp"
diff -Nru kmailtransport-16.12.3/src/kmailtransport/precommandjob.h kmailtransport-17.04.3/src/kmailtransport/precommandjob.h
--- kmailtransport-16.12.3/src/kmailtransport/precommandjob.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/precommandjob.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,81 @@
+/*
+    Copyright (c) 2007 Volker Krause <vkrause@kde.org>
+
+    Based on KMail code by:
+    Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
+    Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_PRECOMMANDJOB_H
+#define MAILTRANSPORT_PRECOMMANDJOB_H
+
+#include "mailtransport_export.h"
+
+#include <KJob>
+
+class PreCommandJobPrivate;
+
+namespace MailTransport {
+/**
+  Job to execute a command.
+  This is used often for sending or receiving mails, for example to set up
+  a tunnel of VPN connection.
+  Basically this is just a KJob wrapper around a QProcess.
+
+  @since 4.4
+ */
+class MAILTRANSPORT_EXPORT PrecommandJob : public KJob
+{
+    Q_OBJECT
+
+public:
+    /**
+      Creates a new precommand job.
+      @param precommand The command to run.
+      @param parent The parent object.
+    */
+    explicit PrecommandJob(const QString &precommand, QObject *parent = nullptr);
+
+    /**
+      Destroys this job.
+    */
+    virtual ~PrecommandJob();
+
+    /**
+      Executes the precommand.
+      Reimplemented from KJob.
+    */
+    void start() Q_DECL_OVERRIDE;
+
+protected:
+
+    /**
+      Reimplemented from KJob.
+    */
+    bool doKill() Q_DECL_OVERRIDE;
+
+private:
+    friend class ::PreCommandJobPrivate;
+    PreCommandJobPrivate *const d;
+    Q_PRIVATE_SLOT(d, void slotFinished(int, QProcess::ExitStatus))
+    Q_PRIVATE_SLOT(d, void slotStarted())
+    Q_PRIVATE_SLOT(d, void slotError(QProcess::ProcessError error))
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_PRECOMMANDJOB_H
diff -Nru kmailtransport-16.12.3/src/kmailtransport/servertest.cpp kmailtransport-17.04.3/src/kmailtransport/servertest.cpp
--- kmailtransport-16.12.3/src/kmailtransport/servertest.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/servertest.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,621 @@
+/*
+  Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+  Copyright (C) 2007 KovoKs <info@kovoks.nl>
+  Copyright (c) 2008 Thomas McGuire <thomas.mcguire@gmx.net>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+// Own
+#include "servertest.h"
+#include "socket.h"
+
+#include <transportbase.h>
+#include <mailtransport_defs.h>
+
+// Qt
+#include <QHash>
+#include <QHostInfo>
+#include <QProgressBar>
+#include <QTimer>
+
+// KDE
+#include "mailtransport_debug.h"
+
+using namespace MailTransport;
+
+namespace MailTransport {
+class ServerTestPrivate
+{
+public:
+    ServerTestPrivate(ServerTest *test);
+
+    ServerTest *const q;
+    QString server;
+    QString fakeHostname;
+    QString testProtocol;
+
+    MailTransport::Socket *normalSocket;
+    MailTransport::Socket *secureSocket;
+
+    QVector< int > connectionResults;
+    QHash< int, QVector<int> > authenticationResults;
+    QSet< ServerTest::Capability > capabilityResults;
+    QHash< int, uint > customPorts;
+    QTimer *normalSocketTimer;
+    QTimer *secureSocketTimer;
+    QTimer *progressTimer;
+
+    QProgressBar *testProgress;
+
+    bool secureSocketFinished;
+    bool normalSocketFinished;
+    bool tlsFinished;
+    bool popSupportsTLS;
+    int normalStage;
+    int secureStage;
+    int encryptionMode;
+
+    bool normalPossible;
+    bool securePossible;
+
+    void finalResult();
+    void handleSMTPIMAPResponse(int type, const QString &text);
+    void sendInitialCapabilityQuery(MailTransport::Socket *socket);
+    bool handlePopConversation(MailTransport::Socket *socket, int type, int stage, const QString &response, bool *shouldStartTLS);
+    QVector<int> parseAuthenticationList(const QStringList &authentications);
+
+    // slots
+    void slotNormalPossible();
+    void slotNormalNotPossible();
+    void slotSslPossible();
+    void slotSslNotPossible();
+    void slotTlsDone();
+    void slotReadNormal(const QString &text);
+    void slotReadSecure(const QString &text);
+    void slotUpdateProgress();
+};
+}
+
+ServerTestPrivate::ServerTestPrivate(ServerTest *test)
+    : q(test)
+    , testProgress(nullptr)
+    , secureSocketFinished(false)
+    , normalSocketFinished(false)
+    , tlsFinished(false)
+    , normalPossible(true)
+    , securePossible(true)
+{
+}
+
+void ServerTestPrivate::finalResult()
+{
+    if (!secureSocketFinished || !normalSocketFinished || !tlsFinished) {
+        return;
+    }
+
+    qCDebug(MAILTRANSPORT_LOG) << "Modes:" << connectionResults;
+    qCDebug(MAILTRANSPORT_LOG) << "Capabilities:" << capabilityResults;
+    qCDebug(MAILTRANSPORT_LOG) << "Normal:" <<  q->normalProtocols();
+    qCDebug(MAILTRANSPORT_LOG) << "SSL:" <<  q->secureProtocols();
+    qCDebug(MAILTRANSPORT_LOG) << "TLS:" <<  q->tlsProtocols();
+
+    if (testProgress) {
+        testProgress->hide();
+    }
+    progressTimer->stop();
+    secureSocketFinished = false;
+    normalSocketFinished = false;
+    tlsFinished = false;
+
+    emit q->finished(connectionResults);
+}
+
+QVector<int> ServerTestPrivate::parseAuthenticationList(const QStringList &authentications)
+{
+    QVector<int> result;
+    for (QStringList::ConstIterator it = authentications.begin();
+         it != authentications.end(); ++it) {
+        QString current = (*it).toUpper();
+        if (current == QLatin1String("LOGIN")) {
+            result << Transport::EnumAuthenticationType::LOGIN;
+        } else if (current == QLatin1String("PLAIN")) {
+            result << Transport::EnumAuthenticationType::PLAIN;
+        } else if (current == QLatin1String("CRAM-MD5")) {
+            result << Transport::EnumAuthenticationType::CRAM_MD5;
+        } else if (current == QLatin1String("DIGEST-MD5")) {
+            result << Transport::EnumAuthenticationType::DIGEST_MD5;
+        } else if (current == QLatin1String("NTLM")) {
+            result << Transport::EnumAuthenticationType::NTLM;
+        } else if (current == QLatin1String("GSSAPI")) {
+            result << Transport::EnumAuthenticationType::GSSAPI;
+        } else if (current == QLatin1String("ANONYMOUS")) {
+            result << Transport::EnumAuthenticationType::ANONYMOUS;
+        }
+        // APOP is handled by handlePopConversation()
+    }
+    qCDebug(MAILTRANSPORT_LOG) << authentications << result;
+
+    // LOGIN doesn't offer anything over PLAIN, requires more server
+    // roundtrips and is not an official SASL mechanism, but a MS-ism,
+    // so only enable it if PLAIN isn't available:
+    if (result.contains(Transport::EnumAuthenticationType::PLAIN)) {
+        result.removeAll(Transport::EnumAuthenticationType::LOGIN);
+    }
+
+    return result;
+}
+
+void ServerTestPrivate::handleSMTPIMAPResponse(int type, const QString &text)
+{
+    if (!text.contains(QLatin1String("AUTH"), Qt::CaseInsensitive)) {
+        qCDebug(MAILTRANSPORT_LOG) << "No authentication possible";
+        return;
+    }
+
+    QStringList protocols;
+    protocols << QStringLiteral("LOGIN") << QStringLiteral("PLAIN")
+              << QStringLiteral("CRAM-MD5") << QStringLiteral("DIGEST-MD5")
+              << QStringLiteral("NTLM") << QStringLiteral("GSSAPI")
+              << QStringLiteral("ANONYMOUS");
+
+    QStringList results;
+    for (int i = 0; i < protocols.count(); ++i) {
+        if (text.contains(protocols.at(i), Qt::CaseInsensitive)) {
+            results.append(protocols.at(i));
+        }
+    }
+
+    authenticationResults[type] = parseAuthenticationList(results);
+
+    // if we couldn't parse any authentication modes, default to clear-text
+    if (authenticationResults[type].size() == 0) {
+        authenticationResults[type] << Transport::EnumAuthenticationType::CLEAR;
+    }
+
+    qCDebug(MAILTRANSPORT_LOG) << "For type" << type << ", we have:" << authenticationResults[type];
+}
+
+void ServerTestPrivate::slotNormalPossible()
+{
+    normalSocketTimer->stop();
+    connectionResults << Transport::EnumEncryption::None;
+}
+
+void ServerTestPrivate::sendInitialCapabilityQuery(MailTransport::Socket *socket)
+{
+    if (testProtocol == IMAP_PROTOCOL) {
+        socket->write(QStringLiteral("1 CAPABILITY"));
+    } else if (testProtocol == SMTP_PROTOCOL) {
+        // Detect the hostname which we send with the EHLO command.
+        // If there is a fake one set, use that, otherwise use the
+        // local host name (and make sure it contains a domain, so the
+        // server thinks it is valid).
+        QString hostname;
+        if (!fakeHostname.isNull()) {
+            hostname = fakeHostname;
+        } else {
+            hostname = QHostInfo::localHostName();
+            if (hostname.isEmpty()) {
+                hostname = QStringLiteral("localhost.invalid");
+            } else if (!hostname.contains(QChar::fromLatin1('.'))) {
+                hostname += QLatin1String(".localnet");
+            }
+        }
+        qCDebug(MAILTRANSPORT_LOG) << "Hostname for EHLO is" << hostname;
+
+        socket->write(QLatin1String("EHLO ") + hostname);
+    }
+}
+
+void ServerTestPrivate::slotTlsDone()
+{
+    // The server will not send a response after starting TLS. Therefore, we have to manually
+    // call slotReadNormal(), because this is not triggered by a data received signal this time.
+    slotReadNormal(QString());
+}
+
+bool ServerTestPrivate::handlePopConversation(MailTransport::Socket *socket, int type, int stage, const QString &response, bool *shouldStartTLS)
+{
+    Q_ASSERT(shouldStartTLS != nullptr);
+
+    // Initial Greeting
+    if (stage == 0) {
+        //Regexp taken from POP3 ioslave
+        QString responseWithoutCRLF = response;
+        responseWithoutCRLF.chop(2);
+        QRegExp re(QStringLiteral("<[A-Za-z0-9\\.\\-_]+@[A-Za-z0-9\\.\\-_]+>$"),
+                   Qt::CaseInsensitive);
+        if (responseWithoutCRLF.indexOf(re) != -1) {
+            authenticationResults[type] << Transport::EnumAuthenticationType::APOP;
+        }
+
+        //Each server is supposed to support clear text login
+        authenticationResults[type] << Transport::EnumAuthenticationType::CLEAR;
+
+        // If we are in TLS stage, the server does not send the initial greeting.
+        // Assume that the APOP availability is the same as with an unsecured connection.
+        if (type == Transport::EnumEncryption::TLS
+            && authenticationResults[Transport::EnumEncryption::None].
+            contains(Transport::EnumAuthenticationType::APOP)) {
+            authenticationResults[Transport::EnumEncryption::TLS]
+                << Transport::EnumAuthenticationType::APOP;
+        }
+
+        socket->write(QStringLiteral("CAPA"));
+        return true;
+    }
+    // CAPA result
+    else if (stage == 1) {
+//     Example:
+//     CAPA
+//     +OK
+//     TOP
+//     USER
+//     SASL LOGIN CRAM-MD5
+//     UIDL
+//     RESP-CODES
+//     .
+        if (response.contains(QLatin1String("TOP"))) {
+            capabilityResults += ServerTest::Top;
+        }
+        if (response.contains(QLatin1String("PIPELINING"))) {
+            capabilityResults += ServerTest::Pipelining;
+        }
+        if (response.contains(QLatin1String("UIDL"))) {
+            capabilityResults += ServerTest::UIDL;
+        }
+        if (response.contains(QLatin1String("STLS"))) {
+            connectionResults << Transport::EnumEncryption::TLS;
+            popSupportsTLS = true;
+        }
+        socket->write(QStringLiteral("AUTH"));
+        return true;
+    }
+    // AUTH response
+    else if (stage == 2) {
+//     Example:
+//     C: AUTH
+//     S: +OK List of supported authentication methods follows
+//     S: LOGIN
+//     S: CRAM-MD5
+//     S:.
+        QString formattedReply = response;
+
+        // Get rid of trailling ".CRLF"
+        formattedReply.chop(3);
+
+        // Get rid of the first +OK line
+        formattedReply = formattedReply.right(formattedReply.size()
+                                              -formattedReply.indexOf(QLatin1Char('\n')) - 1);
+        formattedReply
+            = formattedReply.replace(QLatin1Char(' '), QLatin1Char('-')).
+              replace(QLatin1String("\r\n"), QLatin1String(" "));
+
+        authenticationResults[type]
+            += parseAuthenticationList(formattedReply.split(QLatin1Char(' ')));
+    }
+
+    *shouldStartTLS = popSupportsTLS;
+    return false;
+}
+
+// slotReadNormal() handles normal (no) encryption and TLS encryption.
+// At first, the communication is not encrypted, but if the server supports
+// the STARTTLS/STLS keyword, the same authentication query is done again
+// with TLS.
+void ServerTestPrivate::slotReadNormal(const QString &text)
+{
+    Q_ASSERT(encryptionMode != Transport::EnumEncryption::SSL);
+    static const int tlsHandshakeStage = 42;
+
+    qCDebug(MAILTRANSPORT_LOG) << "Stage" << normalStage + 1 << ", Mode" << encryptionMode;
+
+    // If we are in stage 42, we just do the handshake for TLS encryption and
+    // then reset the stage to -1, so that all authentication modes and
+    // capabilities are queried again for TLS encryption (some servers have
+    // different authentication  methods in normal and in TLS mode).
+    if (normalStage == tlsHandshakeStage) {
+        Q_ASSERT(encryptionMode == Transport::EnumEncryption::TLS);
+        normalStage = -1;
+        normalSocket->startTLS();
+        return;
+    }
+
+    bool shouldStartTLS = false;
+    normalStage++;
+
+    // Handle the whole POP converstation separatly, it is very different from
+    // IMAP and SMTP
+    if (testProtocol == POP_PROTOCOL) {
+        if (handlePopConversation(normalSocket, encryptionMode, normalStage, text,
+                                  &shouldStartTLS)) {
+            return;
+        }
+    } else {
+        // Handle the SMTP/IMAP conversation here. We just send the EHLO command in
+        // sendInitialCapabilityQuery.
+        if (normalStage == 0) {
+            sendInitialCapabilityQuery(normalSocket);
+            return;
+        }
+
+        if (text.contains(QLatin1String("STARTTLS"), Qt::CaseInsensitive)) {
+            connectionResults << Transport::EnumEncryption::TLS;
+            shouldStartTLS = true;
+        }
+        handleSMTPIMAPResponse(encryptionMode, text);
+    }
+
+    // If we reach here, the normal authentication/capabilities query is completed.
+    // Now do the same for TLS.
+    normalSocketFinished = true;
+
+    // If the server announced that STARTTLS/STLS is available, we'll add TLS to the
+    // connection result, do the command and set the stage to 42 to start the handshake.
+    if (shouldStartTLS && encryptionMode == Transport::EnumEncryption::None) {
+        qCDebug(MAILTRANSPORT_LOG) << "Trying TLS...";
+        connectionResults << Transport::EnumEncryption::TLS;
+        if (testProtocol == POP_PROTOCOL) {
+            normalSocket->write(QStringLiteral("STLS"));
+        } else if (testProtocol == IMAP_PROTOCOL) {
+            normalSocket->write(QStringLiteral("2 STARTTLS"));
+        } else {
+            normalSocket->write(QStringLiteral("STARTTLS"));
+        }
+        encryptionMode = Transport::EnumEncryption::TLS;
+        normalStage = tlsHandshakeStage;
+        return;
+    }
+
+    // If we reach here, either the TLS authentication/capabilities query is finished
+    // or the server does not support the STARTTLS/STLS command.
+    tlsFinished = true;
+    finalResult();
+}
+
+void ServerTestPrivate::slotReadSecure(const QString &text)
+{
+    secureStage++;
+    if (testProtocol == POP_PROTOCOL) {
+        bool dummy;
+        if (handlePopConversation(secureSocket, Transport::EnumEncryption::SSL,
+                                  secureStage, text, &dummy)) {
+            return;
+        }
+    } else {
+        if (secureStage == 0) {
+            sendInitialCapabilityQuery(secureSocket);
+            return;
+        }
+        handleSMTPIMAPResponse(Transport::EnumEncryption::SSL, text);
+    }
+    secureSocketFinished = true;
+    finalResult();
+}
+
+void ServerTestPrivate::slotNormalNotPossible()
+{
+    normalSocketTimer->stop();
+    normalPossible = false;
+    normalSocketFinished = true;
+    tlsFinished = true;
+    finalResult();
+}
+
+void ServerTestPrivate::slotSslPossible()
+{
+    secureSocketTimer->stop();
+    connectionResults << Transport::EnumEncryption::SSL;
+}
+
+void ServerTestPrivate::slotSslNotPossible()
+{
+    secureSocketTimer->stop();
+    securePossible = false;
+    secureSocketFinished = true;
+    finalResult();
+}
+
+void ServerTestPrivate::slotUpdateProgress()
+{
+    if (testProgress) {
+        testProgress->setValue(testProgress->value() + 1);
+    }
+}
+
+//---------------------- end private class -----------------------//
+
+ServerTest::ServerTest(QObject *parent)
+    : QObject(parent)
+    , d(new ServerTestPrivate(this))
+{
+    d->normalSocketTimer = new QTimer(this);
+    d->normalSocketTimer->setSingleShot(true);
+    connect(d->normalSocketTimer, SIGNAL(timeout()), SLOT(slotNormalNotPossible()));
+
+    d->secureSocketTimer = new QTimer(this);
+    d->secureSocketTimer->setSingleShot(true);
+    connect(d->secureSocketTimer, SIGNAL(timeout()), SLOT(slotSslNotPossible()));
+
+    d->progressTimer = new QTimer(this);
+    connect(d->progressTimer, SIGNAL(timeout()), SLOT(slotUpdateProgress()));
+}
+
+ServerTest::~ServerTest()
+{
+    delete d;
+}
+
+void ServerTest::start()
+{
+    qCDebug(MAILTRANSPORT_LOG) << d;
+
+    d->connectionResults.clear();
+    d->authenticationResults.clear();
+    d->capabilityResults.clear();
+    d->popSupportsTLS = false;
+    d->normalStage = -1;
+    d->secureStage = -1;
+    d->encryptionMode = Transport::EnumEncryption::None;
+    d->normalPossible = true;
+    d->securePossible = true;
+
+    if (d->testProgress) {
+        d->testProgress->setMaximum(20);
+        d->testProgress->setValue(0);
+        d->testProgress->setTextVisible(true);
+        d->testProgress->show();
+        d->progressTimer->start(1000);
+    }
+
+    d->normalSocket = new MailTransport::Socket(this);
+    d->secureSocket = new MailTransport::Socket(this);
+    d->normalSocket->setObjectName(QStringLiteral("normal"));
+    d->normalSocket->setServer(d->server);
+    d->normalSocket->setProtocol(d->testProtocol);
+    if (d->testProtocol == IMAP_PROTOCOL) {
+        d->normalSocket->setPort(IMAP_PORT);
+        d->secureSocket->setPort(IMAPS_PORT);
+    } else if (d->testProtocol == SMTP_PROTOCOL) {
+        d->normalSocket->setPort(SMTP_PORT);
+        d->secureSocket->setPort(SMTPS_PORT);
+    } else if (d->testProtocol == POP_PROTOCOL) {
+        d->normalSocket->setPort(POP_PORT);
+        d->secureSocket->setPort(POPS_PORT);
+    }
+
+    if (d->customPorts.contains(Transport::EnumEncryption::None)) {
+        d->normalSocket->setPort(d->customPorts.value(Transport::EnumEncryption::None));
+    }
+    if (d->customPorts.contains(Transport::EnumEncryption::SSL)) {
+        d->secureSocket->setPort(d->customPorts.value(Transport::EnumEncryption::SSL));
+    }
+
+    connect(d->normalSocket, SIGNAL(connected()), SLOT(slotNormalPossible()));
+    connect(d->normalSocket, SIGNAL(failed()), SLOT(slotNormalNotPossible()));
+    connect(d->normalSocket, SIGNAL(data(QString)),
+            SLOT(slotReadNormal(QString)));
+    connect(d->normalSocket, SIGNAL(tlsDone()), SLOT(slotTlsDone()));
+    d->normalSocket->reconnect();
+    d->normalSocketTimer->start(10000);
+
+    if (d->secureSocket->port() > 0) {
+        d->secureSocket->setObjectName(QStringLiteral("secure"));
+        d->secureSocket->setServer(d->server);
+        d->secureSocket->setProtocol(d->testProtocol + QLatin1Char('s'));
+        d->secureSocket->setSecure(true);
+        connect(d->secureSocket, SIGNAL(connected()), SLOT(slotSslPossible()));
+        connect(d->secureSocket, SIGNAL(failed()), SLOT(slotSslNotPossible()));
+        connect(d->secureSocket, SIGNAL(data(QString)),
+                SLOT(slotReadSecure(QString)));
+        d->secureSocket->reconnect();
+        d->secureSocketTimer->start(10000);
+    } else {
+        d->slotSslNotPossible();
+    }
+}
+
+void ServerTest::setFakeHostname(const QString &fakeHostname)
+{
+    d->fakeHostname = fakeHostname;
+}
+
+QString ServerTest::fakeHostname() const
+{
+    return d->fakeHostname;
+}
+
+void ServerTest::setServer(const QString &server)
+{
+    d->server = server;
+}
+
+void ServerTest::setPort(Transport::EnumEncryption::type encryptionMode, uint port)
+{
+    Q_ASSERT(encryptionMode == Transport::EnumEncryption::None
+             || encryptionMode == Transport::EnumEncryption::SSL);
+    d->customPorts.insert(encryptionMode, port);
+}
+
+void ServerTest::setProgressBar(QProgressBar *pb)
+{
+    d->testProgress = pb;
+}
+
+void ServerTest::setProtocol(const QString &protocol)
+{
+    d->testProtocol = protocol;
+    d->customPorts.clear();
+}
+
+QString ServerTest::protocol() const
+{
+    return d->testProtocol;
+}
+
+QString ServerTest::server() const
+{
+    return d->server;
+}
+
+int ServerTest::port(TransportBase::EnumEncryption::type encryptionMode) const
+{
+    Q_ASSERT(encryptionMode == Transport::EnumEncryption::None
+             || encryptionMode == Transport::EnumEncryption::SSL);
+    if (d->customPorts.contains(encryptionMode)) {
+        return d->customPorts.value(static_cast<int>(encryptionMode));
+    } else {
+        return -1;
+    }
+}
+
+QProgressBar *ServerTest::progressBar() const
+{
+    return d->testProgress;
+}
+
+QVector<int> ServerTest::normalProtocols() const
+{
+    return d->authenticationResults[TransportBase::EnumEncryption::None];
+}
+
+bool ServerTest::isNormalPossible() const
+{
+    return d->normalPossible;
+}
+
+QVector<int> ServerTest::tlsProtocols() const
+{
+    return d->authenticationResults[TransportBase::EnumEncryption::TLS];
+}
+
+QVector<int> ServerTest::secureProtocols() const
+{
+    return d->authenticationResults[Transport::EnumEncryption::SSL];
+}
+
+bool ServerTest::isSecurePossible() const
+{
+    return d->securePossible;
+}
+
+QList< ServerTest::Capability > ServerTest::capabilities() const
+{
+    return d->capabilityResults.toList();
+}
+
+#include "moc_servertest.cpp"
diff -Nru kmailtransport-16.12.3/src/kmailtransport/servertest.h kmailtransport-17.04.3/src/kmailtransport/servertest.h
--- kmailtransport-16.12.3/src/kmailtransport/servertest.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/servertest.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,224 @@
+/*
+  Copyright (C) 2007 KovoKs <info@kovoks.nl>
+  Copyright (c) 2008 Thomas McGuire <thomas.mcguire@gmx.net>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_SERVERTEST_H
+#define MAILTRANSPORT_SERVERTEST_H
+
+#include <mailtransport_export.h>
+#include <transport.h>
+
+#include <QObject>
+#include <QList>
+
+class QProgressBar;
+
+namespace MailTransport {
+class ServerTestPrivate;
+
+/**
+ * @class ServerTest
+ * This class can be used to test certain server to see if they support stuff.
+ * @author Tom Albers <tomalbers@kde.nl>
+ */
+class MAILTRANSPORT_EXPORT ServerTest : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(QString server READ server WRITE setServer)
+    Q_PROPERTY(QString protocol READ protocol WRITE setProtocol)
+    Q_PROPERTY(QProgressBar *progressBar READ progressBar WRITE setProgressBar)
+
+public:
+
+    /**
+     * This enumeration has the special capabilities a server might
+     * support. This covers only capabilities not related to authentication.
+     * @since 4.1
+     */
+    enum Capability {
+        Pipelining, ///< POP3 only. The server supports pipeplining of commands
+        Top,        ///< POP3 only. The server supports fetching only the headers
+        UIDL        ///< POP3 only. The server has support for unique identifiers
+    };
+
+    /**
+     * Creates a new server test.
+     *
+     * @param parent The parent widget.
+     */
+    ServerTest(QObject *parent = nullptr);
+
+    /**
+     * Destroys the server test.
+     */
+    ~ServerTest();
+
+    /**
+     * Sets the server to test.
+     */
+    void setServer(const QString &server);
+
+    /**
+     * Returns the server to test.
+     */
+    QString server() const;
+
+    /**
+     * Set a custom port to use.
+     *
+     * Each encryption mode (no encryption or SSL) has a different port.
+     * TLS uses the same port as no encryption, because TLS is invoked during
+     * a normal session.
+     *
+     * If this function is never called, the default port is used, which is:
+     * (normal first, then SSL)
+     * SMTP: 25, 465
+     * POP: 110, 995
+     * IMAP: 143, 993
+     *
+     * @param encryptionMode the port will only be used in this encryption mode.
+     *                       Valid values for this are only 'None' and 'SSL'.
+     * @param port the port to use
+     *
+     * @since 4.1
+     */
+    void setPort(Transport::EnumEncryption::type encryptionMode, uint port);
+
+    /**
+     * @param encryptionMode the port of this encryption mode is returned.
+     *                       Can only be 'None' and 'SSL'
+     *
+     * @return the port set by @ref setPort or -1 if @ref setPort() was never
+     *         called for this encryption mode.
+     *
+     * @since 4.1
+     */
+    int port(Transport::EnumEncryption::type encryptionMode) const;
+
+    /**
+     * Sets a fake hostname for the test. This is currently only used when
+     * testing a SMTP server; there, the command for testing the capabilities
+     * (called EHLO) needs to have the hostname of the client included.
+     * The user can however choose to send a fake hostname instead of the
+     * local hostname to work around various problems. This fake hostname needs
+     * to be set here.
+     *
+     * @param fakeHostname the fake hostname to send
+     */
+    void setFakeHostname(const QString &fakeHostname);
+
+    /**
+     * @return the fake hostname, as set before with @ref setFakeHostname
+     */
+    QString fakeHostname() const;
+
+    /**
+     * Makes @p pb the progressbar to use. This class will call show()
+     * and hide() and will count down. It does not take ownership of
+     * the progressbar.
+     */
+    void setProgressBar(QProgressBar *pb);
+
+    /**
+     * Returns the used progress bar.
+     */
+    QProgressBar *progressBar() const;
+
+    /**
+     * Sets @p protocol the protocol to test, currently supported are
+     * "smtp", "pop" and "imap".
+     */
+    void setProtocol(const QString &protocol);
+
+    /**
+     * Returns the protocol.
+     */
+    QString protocol() const;
+
+    /**
+     * Starts the test. Will emit finished() when done.
+     */
+    void start();
+
+    /**
+     * Get the protocols for the normal connections.. Call this only
+     * after the finished() signals has been sent.
+     * @return an enum of the type Transport::EnumAuthenticationType
+     */
+    QVector<int> normalProtocols() const;
+
+    /**
+     * tells you if the normal server is available
+     * @since 4.5
+     */
+    bool isNormalPossible() const;
+
+    /**
+     * Get the protocols for the TLS connections. Call this only
+     * after the finished() signals has been sent.
+     * @return an enum of the type Transport::EnumAuthenticationType
+     * @since 4.1
+     */
+    QVector<int> tlsProtocols() const;
+
+    /**
+     * Get the protocols for the SSL connections. Call this only
+     * after the finished() signals has been sent.
+     * @return an enum of the type Transport::EnumAuthenticationType
+     */
+    QVector<int> secureProtocols() const;
+
+    /**
+     * tells you if the ssl server is available
+     * @since 4.5
+     */
+    bool isSecurePossible() const;
+
+    /**
+     * Get the special capabilities of the server.
+     * Call this only after the finished() signals has been sent.
+     *
+     * @return the list of special capabilities of the server.
+     * @since 4.1
+     */
+    QList<Capability> capabilities() const;
+
+Q_SIGNALS:
+    /**
+     * This will be emitted when the test is done. It will contain
+     * the values from the enum EnumEncryption which are possible.
+     */
+    void finished(const QVector<int> &);
+
+private:
+    Q_DECLARE_PRIVATE(ServerTest)
+    ServerTestPrivate *const d;
+
+    Q_PRIVATE_SLOT(d, void slotNormalPossible())
+    Q_PRIVATE_SLOT(d, void slotTlsDone())
+    Q_PRIVATE_SLOT(d, void slotSslPossible())
+    Q_PRIVATE_SLOT(d, void slotReadNormal(const QString &text))
+    Q_PRIVATE_SLOT(d, void slotReadSecure(const QString &text))
+    Q_PRIVATE_SLOT(d, void slotNormalNotPossible())
+    Q_PRIVATE_SLOT(d, void slotSslNotPossible())
+    Q_PRIVATE_SLOT(d, void slotUpdateProgress())
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_SERVERTEST_H
diff -Nru kmailtransport-16.12.3/src/kmailtransport/smtpjob.cpp kmailtransport-17.04.3/src/kmailtransport/smtpjob.cpp
--- kmailtransport-16.12.3/src/kmailtransport/smtpjob.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/smtpjob.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,347 @@
+/*
+  Copyright (c) 2007 Volker Krause <vkrause@kde.org>
+
+  Based on KMail code by:
+  Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#include "smtpjob.h"
+#include "transport.h"
+#include "mailtransport_defs.h"
+#include "precommandjob.h"
+
+#include <QBuffer>
+#include <QHash>
+#include <QPointer>
+
+#include <KLocalizedString>
+#include <QUrl>
+#include <QUrlQuery>
+#include "mailtransport_debug.h"
+#include <KIO/Job>
+#include <KIO/Scheduler>
+#include <KPasswordDialog>
+
+using namespace MailTransport;
+
+class SlavePool
+{
+public:
+    SlavePool() : ref(0)
+    {
+    }
+
+    int ref;
+    QHash<int, KIO::Slave *> slaves;
+
+    void removeSlave(KIO::Slave *slave, bool disconnect = false)
+    {
+        qCDebug(MAILTRANSPORT_LOG) << "Removing slave" << slave << "from pool";
+        const int slaveKey = slaves.key(slave);
+        if (slaveKey > 0) {
+            slaves.remove(slaveKey);
+            if (disconnect) {
+                KIO::Scheduler::disconnectSlave(slave);
+            }
+        }
+    }
+};
+
+Q_GLOBAL_STATIC(SlavePool, s_slavePool)
+
+/**
+ * Private class that helps to provide binary compatibility between releases.
+ * @internal
+ */
+class SmtpJobPrivate
+{
+public:
+    SmtpJobPrivate(SmtpJob *parent) : q(parent)
+    {
+    }
+
+    SmtpJob *q;
+    KIO::Slave *slave;
+    enum State {
+        Idle, Precommand, Smtp
+    } currentState;
+    bool finished;
+};
+
+SmtpJob::SmtpJob(Transport *transport, QObject *parent)
+    : TransportJob(transport, parent)
+    , d(new SmtpJobPrivate(this))
+{
+    d->currentState = SmtpJobPrivate::Idle;
+    d->slave = nullptr;
+    d->finished = false;
+    if (!s_slavePool.isDestroyed()) {
+        s_slavePool->ref++;
+    }
+    KIO::Scheduler::connect(SIGNAL(slaveError(KIO::Slave *,int,QString)), this, SLOT(slaveError(KIO::Slave *,int,QString)));
+}
+
+SmtpJob::~SmtpJob()
+{
+    if (!s_slavePool.isDestroyed()) {
+        s_slavePool->ref--;
+        if (s_slavePool->ref == 0) {
+            qCDebug(MAILTRANSPORT_LOG) << "clearing SMTP slave pool" << s_slavePool->slaves.count();
+            foreach (KIO::Slave *slave, s_slavePool->slaves) {
+                if (slave) {
+                    KIO::Scheduler::disconnectSlave(slave);
+                }
+            }
+            s_slavePool->slaves.clear();
+        }
+    }
+    delete d;
+}
+
+void SmtpJob::doStart()
+{
+    if (s_slavePool.isDestroyed()) {
+        return;
+    }
+
+    if ((!s_slavePool->slaves.isEmpty()
+         && s_slavePool->slaves.contains(transport()->id()))
+        || transport()->precommand().isEmpty()) {
+        d->currentState = SmtpJobPrivate::Smtp;
+        startSmtpJob();
+    } else {
+        d->currentState = SmtpJobPrivate::Precommand;
+        PrecommandJob *job = new PrecommandJob(transport()->precommand(), this);
+        addSubjob(job);
+        job->start();
+    }
+}
+
+void SmtpJob::startSmtpJob()
+{
+    if (s_slavePool.isDestroyed()) {
+        return;
+    }
+
+    QUrl destination;
+    destination.setScheme((transport()->encryption() == Transport::EnumEncryption::SSL)
+                          ? SMTPS_PROTOCOL : SMTP_PROTOCOL);
+    destination.setHost(transport()->host().trimmed());
+    destination.setPort(transport()->port());
+
+    QUrlQuery destinationQuery(destination);
+    destinationQuery.addQueryItem(QStringLiteral("headers"), QStringLiteral("0"));
+    destinationQuery.addQueryItem(QStringLiteral("from"), sender());
+
+    for (const QString &str : to()) {
+        destinationQuery.addQueryItem(QStringLiteral("to"), str);
+    }
+    for (const QString &str : cc()) {
+        destinationQuery.addQueryItem(QStringLiteral("cc"), str);
+    }
+    for (const QString &str : bcc()) {
+        destinationQuery.addQueryItem(QStringLiteral("bcc"), str);
+    }
+
+    if (transport()->specifyHostname()) {
+        destinationQuery.addQueryItem(QStringLiteral("hostname"), transport()->localHostname());
+    }
+
+    if (transport()->requiresAuthentication()) {
+        QString user = transport()->userName();
+        QString passwd = transport()->password();
+        if ((user.isEmpty() || passwd.isEmpty())
+            && transport()->authenticationType() != Transport::EnumAuthenticationType::GSSAPI) {
+            QPointer<KPasswordDialog> dlg
+                = new KPasswordDialog(
+                nullptr,
+                KPasswordDialog::ShowUsernameLine
+                |KPasswordDialog::ShowKeepPassword);
+            dlg->setPrompt(i18n("You need to supply a username and a password "
+                                "to use this SMTP server."));
+            dlg->setKeepPassword(transport()->storePassword());
+            dlg->addCommentLine(QString(), transport()->name());
+            dlg->setUsername(user);
+            dlg->setPassword(passwd);
+
+            bool gotIt = false;
+            if (dlg->exec()) {
+                transport()->setUserName(dlg->username());
+                transport()->setPassword(dlg->password());
+                transport()->setStorePassword(dlg->keepPassword());
+                transport()->save();
+                gotIt = true;
+            }
+            delete dlg;
+
+            if (!gotIt) {
+                setError(KilledJobError);
+                emitResult();
+                return;
+            }
+        }
+        destination.setUserName(transport()->userName());
+        destination.setPassword(transport()->password());
+    }
+
+    // dotstuffing is now done by the slave (see setting of metadata)
+    if (!data().isEmpty()) {
+        // allow +5% for subsequent LF->CRLF and dotstuffing (an average
+        // over 2G-lines gives an average line length of 42-43):
+        destinationQuery.addQueryItem(QStringLiteral("size"),
+                                      QString::number(qRound(data().length() * 1.05)));
+    }
+
+    destination.setPath(QStringLiteral("/send"));
+    destination.setQuery(destinationQuery);
+
+    d->slave = s_slavePool->slaves.value(transport()->id());
+    if (!d->slave) {
+        KIO::MetaData slaveConfig;
+        slaveConfig.insert(QStringLiteral("tls"),
+                           (transport()->encryption() == Transport::EnumEncryption::TLS)
+                           ? QStringLiteral("on") : QStringLiteral("off"));
+        if (transport()->requiresAuthentication()) {
+            slaveConfig.insert(QStringLiteral("sasl"), transport()->authenticationTypeString());
+        }
+        d->slave = KIO::Scheduler::getConnectedSlave(destination, slaveConfig);
+        qCDebug(MAILTRANSPORT_LOG) << "Created new SMTP slave" << d->slave;
+        s_slavePool->slaves.insert(transport()->id(), d->slave);
+    } else {
+        qCDebug(MAILTRANSPORT_LOG) << "Re-using existing slave" << d->slave;
+    }
+
+    KIO::TransferJob *job = KIO::put(destination, -1, KIO::HideProgressInfo);
+    if (!d->slave || !job) {
+        setError(UserDefinedError);
+        setErrorText(i18n("Unable to create SMTP job."));
+        emitResult();
+        return;
+    }
+
+    job->addMetaData(QStringLiteral("lf2crlf+dotstuff"), QStringLiteral("slave"));
+    connect(job, &KIO::TransferJob::dataReq, this, &SmtpJob::dataRequest);
+
+    addSubjob(job);
+    KIO::Scheduler::assignJobToSlave(d->slave, job);
+
+    setTotalAmount(KJob::Bytes, data().length());
+}
+
+bool SmtpJob::doKill()
+{
+    if (s_slavePool.isDestroyed()) {
+        return false;
+    }
+
+    if (!hasSubjobs()) {
+        return true;
+    }
+    if (d->currentState == SmtpJobPrivate::Precommand) {
+        return subjobs().first()->kill();
+    } else if (d->currentState == SmtpJobPrivate::Smtp) {
+        KIO::SimpleJob *job = static_cast<KIO::SimpleJob *>(subjobs().first());
+        clearSubjobs();
+        KIO::Scheduler::cancelJob(job);
+        s_slavePool->removeSlave(d->slave);
+        return true;
+    }
+    return false;
+}
+
+void SmtpJob::slotResult(KJob *job)
+{
+    if (s_slavePool.isDestroyed()) {
+        return;
+    }
+
+    // The job has finished, so we don't care about any further errors. Set
+    // d->finished to true, so slaveError() knows about this and doesn't call
+    // emitResult() anymore.
+    // Sometimes, the SMTP slave emits more than one error
+    //
+    // The first error causes slotResult() to be called, but not slaveError(), since
+    // the scheduler doesn't emit errors for connected slaves.
+    //
+    // The second error then causes slaveError() to be called (as the slave is no
+    // longer connected), which does emitResult() a second time, which is invalid
+    // (and triggers an assert in KMail).
+    d->finished = true;
+
+    // Normally, calling TransportJob::slotResult() whould set the proper error code
+    // for error() via KComposite::slotResult(). However, we can't call that here,
+    // since that also emits the result signal.
+    // In KMail, when there are multiple mails in the outbox, KMail tries to send
+    // the next mail when it gets the result signal, which then would reuse the
+    // old broken slave from the slave pool if there was an error.
+    // To prevent that, we call TransportJob::slotResult() only after removing the
+    // slave from the pool and calculate the error code ourselves.
+    int errorCode = error();
+    if (!errorCode) {
+        errorCode = job->error();
+    }
+
+    if (errorCode && d->currentState == SmtpJobPrivate::Smtp) {
+        s_slavePool->removeSlave(d->slave, errorCode != KIO::ERR_SLAVE_DIED);
+        TransportJob::slotResult(job);
+        return;
+    }
+
+    TransportJob::slotResult(job);
+    if (!error() && d->currentState == SmtpJobPrivate::Precommand) {
+        d->currentState = SmtpJobPrivate::Smtp;
+        startSmtpJob();
+        return;
+    }
+    if (!error()) {
+        emitResult();
+    }
+}
+
+void SmtpJob::dataRequest(KIO::Job *job, QByteArray &data)
+{
+    if (s_slavePool.isDestroyed()) {
+        return;
+    }
+
+    Q_UNUSED(job);
+    Q_ASSERT(job);
+    if (buffer()->atEnd()) {
+        data.clear();
+    } else {
+        Q_ASSERT(buffer()->isOpen());
+        data = buffer()->read(32 * 1024);
+    }
+    setProcessedAmount(KJob::Bytes, buffer()->pos());
+}
+
+void SmtpJob::slaveError(KIO::Slave *slave, int errorCode, const QString &errorMsg)
+{
+    if (s_slavePool.isDestroyed()) {
+        return;
+    }
+
+    s_slavePool->removeSlave(slave, errorCode != KIO::ERR_SLAVE_DIED);
+    if (d->slave == slave && !d->finished) {
+        setError(errorCode);
+        setErrorText(KIO::buildErrorString(errorCode, errorMsg));
+        emitResult();
+    }
+}
+
+#include "moc_smtpjob.cpp"
diff -Nru kmailtransport-16.12.3/src/kmailtransport/smtpjob.h kmailtransport-17.04.3/src/kmailtransport/smtpjob.h
--- kmailtransport-16.12.3/src/kmailtransport/smtpjob.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/smtpjob.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,84 @@
+/*
+    Copyright (c) 2007 Volker Krause <vkrause@kde.org>
+
+    Based on KMail code by:
+    Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_SMTPJOB_H
+#define MAILTRANSPORT_SMTPJOB_H
+
+#include <transportjob.h>
+
+#include <mailtransport_export.h>
+
+namespace KIO {
+class Job;
+class Slave;
+}
+
+class SmtpJobPrivate;
+
+namespace MailTransport {
+/**
+  Mail transport job for SMTP.
+  Internally, all jobs for a specific transport are queued to use the same
+  KIO::Slave. This avoids multiple simultaneous connections to the server,
+  which is not always allowed. Also, re-using an already existing connection
+  avoids the login overhead and can improve performance.
+
+  Precommands are automatically executed, once per opening a connection to the
+  server (not necessarily once per message).
+*/
+class MAILTRANSPORT_EXPORT SmtpJob : public TransportJob
+{
+    Q_OBJECT
+public:
+    /**
+      Creates a SmtpJob.
+      @param transport The transport settings.
+      @param parent The parent object.
+    */
+    explicit SmtpJob(Transport *transport, QObject *parent = nullptr);
+
+    /**
+      Deletes this job.
+    */
+    virtual ~SmtpJob();
+
+protected:
+    void doStart() Q_DECL_OVERRIDE;
+    bool doKill() Q_DECL_OVERRIDE;
+
+protected Q_SLOTS:
+    void slotResult(KJob *job) Q_DECL_OVERRIDE;
+    void slaveError(KIO::Slave *slave, int errorCode, const QString &errorMsg);
+
+private:
+    void startSmtpJob();
+
+private Q_SLOTS:
+    void dataRequest(KIO::Job *job, QByteArray &data);
+
+private:
+    friend class ::SmtpJobPrivate;
+    SmtpJobPrivate *const d;
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_SMTPJOB_H
diff -Nru kmailtransport-16.12.3/src/kmailtransport/socket.cpp kmailtransport-17.04.3/src/kmailtransport/socket.cpp
--- kmailtransport-16.12.3/src/kmailtransport/socket.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/socket.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,232 @@
+/*
+  Copyright (C) 2006-2007 KovoKs <info@kovoks.nl>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+// Uncomment the next line for full comm debug
+// #define comm_debug
+
+// Own
+#include "socket.h"
+
+// Qt
+#include <QByteArray>
+#include <QSslSocket>
+#include <QNetworkProxy>
+// KDE
+#include "mailtransport_debug.h"
+
+using namespace MailTransport;
+
+namespace MailTransport {
+class SocketPrivate
+{
+public:
+    SocketPrivate(Socket *s);
+    Socket *const q;
+    QSslSocket *socket;
+    QString server;
+    QString protocol;
+    int port;
+    bool secure;
+
+    // slots
+    void slotConnected();
+    void slotStateChanged(QAbstractSocket::SocketState state);
+    void slotModeChanged(QSslSocket::SslMode state);
+    void slotSocketRead();
+    void slotSslErrors(const QList<QSslError> &errors);
+
+private:
+    QString m_msg;
+};
+}
+
+SocketPrivate::SocketPrivate(Socket *s)
+    : q(s)
+    , socket(nullptr)
+    , port(0)
+    , secure(false)
+{
+}
+
+void SocketPrivate::slotConnected()
+{
+    qCDebug(MAILTRANSPORT_LOG);
+
+    if (!secure) {
+        qCDebug(MAILTRANSPORT_LOG) << "normal connect";
+        emit q->connected();
+    } else {
+        qCDebug(MAILTRANSPORT_LOG) << "encrypted connect";
+        socket->startClientEncryption();
+    }
+}
+
+void SocketPrivate::slotStateChanged(QAbstractSocket::SocketState state)
+{
+#ifdef comm_debug
+    qCDebug(MAILTRANSPORT_LOG) << "State is now:" << (int)state;
+#endif
+    if (state == QAbstractSocket::UnconnectedState) {
+        emit q->failed();
+    }
+}
+
+void SocketPrivate::slotModeChanged(QSslSocket::SslMode state)
+{
+#ifdef comm_debug
+    qCDebug(MAILTRANSPORT_LOG) << "Mode is now:" << state;
+#endif
+    if (state == QSslSocket::SslClientMode) {
+        emit q->tlsDone();
+    }
+}
+
+void SocketPrivate::slotSocketRead()
+{
+    qCDebug(MAILTRANSPORT_LOG);
+
+    if (!socket) {
+        return;
+    }
+
+    m_msg += QLatin1String(socket->readAll());
+
+    if (!m_msg.endsWith(QLatin1Char('\n'))) {
+        return;
+    }
+
+#ifdef comm_debug
+    qCDebug(MAILTRANSPORT_LOG) << socket->isEncrypted() << m_msg.trimmed();
+#endif
+
+    emit q->data(m_msg);
+    m_msg.clear();
+}
+
+void SocketPrivate::slotSslErrors(const QList<QSslError> &)
+{
+    qCDebug(MAILTRANSPORT_LOG);
+    /* We can safely ignore the errors, we are only interested in the
+    capabilities. We're not sending auth info. */
+    socket->ignoreSslErrors();
+    emit q->connected();
+}
+
+// ------------------ end private ---------------------------//
+
+Socket::Socket(QObject *parent)
+    : QObject(parent)
+    , d(new SocketPrivate(this))
+{
+    qCDebug(MAILTRANSPORT_LOG);
+}
+
+Socket::~Socket()
+{
+    qCDebug(MAILTRANSPORT_LOG);
+    delete d;
+}
+
+void Socket::reconnect()
+{
+    qCDebug(MAILTRANSPORT_LOG) << "Connecting to:" << d->server <<  ":" <<  d->port;
+
+#ifdef comm_debug
+    // qCDebug(MAILTRANSPORT_LOG) << d->protocol;
+#endif
+
+    if (d->socket) {
+        return;
+    }
+
+    d->socket = new QSslSocket(this);
+    d->socket->setProxy(QNetworkProxy::DefaultProxy);
+    d->socket->connectToHost(d->server, d->port);
+
+    d->socket->setProtocol(QSsl::AnyProtocol);
+
+    connect(d->socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
+            SLOT(slotStateChanged(QAbstractSocket::SocketState)));
+    connect(d->socket, SIGNAL(modeChanged(QSslSocket::SslMode)),
+            SLOT(slotModeChanged(QSslSocket::SslMode)));
+    connect(d->socket, SIGNAL(connected()), SLOT(slotConnected()));
+    connect(d->socket, SIGNAL(readyRead()), SLOT(slotSocketRead()));
+    connect(d->socket, &QSslSocket::encrypted, this, &Socket::connected);
+    connect(d->socket, SIGNAL(sslErrors(QList<QSslError>)),
+            SLOT(slotSslErrors(QList<QSslError>)));
+}
+
+void Socket::write(const QString &text)
+{
+    // qCDebug(MAILTRANSPORT_LOG);
+    // Eat things in the queue when there is no connection. We need
+    // to get a connection first don't we...
+    if (!d->socket || !available()) {
+        return;
+    }
+
+    QByteArray cs = (text + QLatin1String("\r\n")).toLatin1();
+
+#ifdef comm_debug
+    qCDebug(MAILTRANSPORT_LOG) << "C   :" << cs;
+#endif
+
+    d->socket->write(cs.data(), cs.size());
+}
+
+bool Socket::available()
+{
+    // qCDebug(MAILTRANSPORT_LOG);
+    bool ok = d->socket && d->socket->state() == QAbstractSocket::ConnectedState;
+    return ok;
+}
+
+void Socket::startTLS()
+{
+    qCDebug(MAILTRANSPORT_LOG) << objectName();
+    d->socket->setProtocol(QSsl::TlsV1_0OrLater);
+    d->socket->startClientEncryption();
+}
+
+void Socket::setProtocol(const QString &proto)
+{
+    d->protocol = proto;
+}
+
+void Socket::setServer(const QString &server)
+{
+    d->server = server;
+}
+
+void Socket::setPort(int port)
+{
+    d->port = port;
+}
+
+int Socket::port() const
+{
+    return d->port;
+}
+
+void Socket::setSecure(bool what)
+{
+    d->secure = what;
+}
+
+#include "moc_socket.cpp"
diff -Nru kmailtransport-16.12.3/src/kmailtransport/socket.h kmailtransport-17.04.3/src/kmailtransport/socket.h
--- kmailtransport-16.12.3/src/kmailtransport/socket.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/socket.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,134 @@
+/*
+  Copyright (C) 2006-2007 KovoKs <info@kovoks.nl>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_SOCKET_H
+#define MAILTRANSPORT_SOCKET_H
+
+#include <mailtransport_export.h>
+
+#include <QtNetwork/QSslSocket>
+
+namespace MailTransport {
+class SocketPrivate;
+
+/**
+ * @class Socket
+ * Responsible for communicating with the server, it's designed to work
+ * with the ServerTest class.
+ * @author Tom Albers <tomalbers@kde.nl>
+ */
+class Socket : public QObject
+{
+    Q_OBJECT
+
+public:
+
+    /**
+     * Contructor, it will not auto connect. Call reconnect() to connect to
+     * the parameters given.
+     * @param parent the parent
+     */
+    explicit Socket(QObject *parent);
+
+    /**
+     * Destructor
+     */
+    ~Socket();
+
+    /**
+     * Existing connection will be closed and a new connection will be
+     * made
+     */
+    virtual void reconnect();
+
+    /**
+     * Write @p text to the socket
+     */
+    virtual void write(const QString &text);
+
+    /**
+     * @return true when the connection is live and kicking
+     */
+    virtual bool available();
+
+    /**
+     * set the protocol to use
+     */
+    void setProtocol(const QString &proto);
+
+    /**
+     * set the server to use
+     */
+    void setServer(const QString &server);
+
+    /**
+     * set the port to use. If not specified, it will use the default
+     * belonging to the protocol.
+     */
+    void setPort(int port);
+
+    /**
+     * returns the used port.
+     */
+    int port() const;
+
+    /**
+     * this will be a secure connection
+     */
+    void setSecure(bool what);
+
+    /**
+     * If you want to start TLS encryption, call this. For example after the starttls command.
+     */
+    void startTLS();
+
+private:
+    Q_DECLARE_PRIVATE(Socket)
+    SocketPrivate *const d;
+
+    Q_PRIVATE_SLOT(d, void slotConnected())
+    Q_PRIVATE_SLOT(d, void slotStateChanged(QAbstractSocket::SocketState state))
+    Q_PRIVATE_SLOT(d, void slotModeChanged(QSslSocket::SslMode state))
+    Q_PRIVATE_SLOT(d, void slotSocketRead())
+    Q_PRIVATE_SLOT(d, void slotSslErrors(const QList<QSslError> &errors))
+
+Q_SIGNALS:
+    /**
+     * emits the incoming data
+     */
+    void data(const QString &);
+
+    /**
+     * emitted when there is a connection (ready to send something).
+     */
+    void connected();
+
+    /**
+     * emitted when not connected.
+     */
+    void failed();
+
+    /**
+     * emitted when startShake() is completed.
+     */
+    void tlsDone();
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_SOCKET_H
diff -Nru kmailtransport-16.12.3/src/kmailtransport/tests/CMakeLists.txt kmailtransport-17.04.3/src/kmailtransport/tests/CMakeLists.txt
--- kmailtransport-16.12.3/src/kmailtransport/tests/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/tests/CMakeLists.txt	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,14 @@
+
+include(ECMMarkAsTest)
+
+find_package(KF5TextWidgets ${KF5_VERSION} CONFIG REQUIRED)
+find_package(Qt5Test CONFIG REQUIRED)
+
+set(tm_srcs transportmgr.cpp)
+add_executable(transportmgr ${tm_srcs})
+ecm_mark_as_test(transportmgr)
+target_link_libraries(transportmgr KF5MailTransport Qt5::Widgets KF5::I18n KF5::ConfigGui KF5::Completion KF5::TextWidgets KF5::CoreAddons)
+
+add_executable(servertest servertest.cpp)
+ecm_mark_as_test(servertest)
+target_link_libraries(servertest KF5MailTransport KF5::I18n KF5::ConfigGui Qt5::Widgets)
diff -Nru kmailtransport-16.12.3/src/kmailtransport/tests/servertest.cpp kmailtransport-17.04.3/src/kmailtransport/tests/servertest.cpp
--- kmailtransport-16.12.3/src/kmailtransport/tests/servertest.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/tests/servertest.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,45 @@
+/*
+    Copyright (c) 2015 Volker Krause <vkrause@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "servertest.h"
+
+#include <QApplication>
+#include <QDebug>
+
+using namespace MailTransport;
+
+int main(int argc, char **argv)
+{
+    if (argc <= 2) {
+        qFatal("Usage: servertest <protocol> <hostname>");
+    }
+
+    QApplication app(argc, argv);
+    app.setApplicationName(QStringLiteral("kmailtransport-servertest"));
+
+    ServerTest test;
+    test.setProtocol(app.arguments().at(1));
+    test.setServer(app.arguments().at(2));
+    test.start();
+    QObject::connect(&test, &ServerTest::finished, [](const QVector<int> &encs) {
+        qDebug() << encs;
+        QCoreApplication::quit();
+    });
+    return app.exec();
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransport/tests/transportmgr.cpp kmailtransport-17.04.3/src/kmailtransport/tests/transportmgr.cpp
--- kmailtransport-16.12.3/src/kmailtransport/tests/transportmgr.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/tests/transportmgr.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,158 @@
+/*
+    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "transportmgr.h"
+
+#include <widgets/transportconfigdialog.h>
+#include <transportmanager.h>
+#include <widgets/transportmanagementwidget.h>
+#include <transportjob.h>
+#include <transport.h>
+#include <QVBoxLayout>
+
+#include <QApplication>
+#include <QLineEdit>
+#include <QDebug>
+#include <KTextEdit>
+
+#include <QPushButton>
+
+using namespace MailTransport;
+
+TransportMgr::TransportMgr()
+    : mCurrentJob(nullptr)
+{
+    QVBoxLayout *vbox = new QVBoxLayout;
+    vbox->setMargin(0);
+    setLayout(vbox);
+
+    vbox->addWidget(new TransportManagementWidget(this));
+    mComboBox = new TransportComboBox(this);
+    mComboBox->setEditable(true);
+    vbox->addWidget(mComboBox);
+    QPushButton *b = new QPushButton(QStringLiteral("&Edit"), this);
+    vbox->addWidget(b);
+    connect(b, &QPushButton::clicked, this, &TransportMgr::editBtnClicked);
+    b = new QPushButton(QStringLiteral("&Remove all transports"), this);
+    vbox->addWidget(b);
+    connect(b, &QPushButton::clicked, this, &TransportMgr::removeAllBtnClicked);
+    mSenderEdit = new QLineEdit(this);
+    mSenderEdit->setPlaceholderText(QStringLiteral("Sender"));
+    vbox->addWidget(mSenderEdit);
+    mToEdit = new QLineEdit(this);
+    mToEdit->setPlaceholderText(QStringLiteral("To"));
+    vbox->addWidget(mToEdit);
+    mCcEdit = new QLineEdit(this);
+    mCcEdit->setPlaceholderText(QStringLiteral("Cc"));
+    vbox->addWidget(mCcEdit);
+    mBccEdit = new QLineEdit(this);
+    mBccEdit->setPlaceholderText(QStringLiteral("Bcc"));
+    vbox->addWidget(mBccEdit);
+    mMailEdit = new KTextEdit(this);
+    mMailEdit->setAcceptRichText(false);
+    mMailEdit->setLineWrapMode(QTextEdit::NoWrap);
+    vbox->addWidget(mMailEdit);
+    b = new QPushButton(QStringLiteral("&Send"), this);
+    connect(b, &QPushButton::clicked, this, &TransportMgr::sendBtnClicked);
+    vbox->addWidget(b);
+    b = new QPushButton(QStringLiteral("&Cancel"), this);
+    connect(b, &QPushButton::clicked, this, &TransportMgr::cancelBtnClicked);
+    vbox->addWidget(b);
+}
+
+void TransportMgr::removeAllBtnClicked()
+{
+    MailTransport::TransportManager *manager = MailTransport::TransportManager::self();
+    QList<Transport *> transports = manager->transports();
+    for (int i = 0; i < transports.count(); i++) {
+        MailTransport::Transport *transport = transports.at(i);
+        qDebug() << transport->host();
+        manager->removeTransport(transport->id());
+    }
+}
+
+void TransportMgr::editBtnClicked()
+{
+    const int index = mComboBox->currentTransportId();
+    if (index < 0) {
+        return;
+    }
+    TransportManager::self()->configureTransport(TransportManager::self()->transportById(index), this);
+}
+
+void TransportMgr::sendBtnClicked()
+{
+    TransportJob *job;
+    job = TransportManager::self()->createTransportJob(mComboBox->currentTransportId());
+    if (!job) {
+        qDebug() << "Invalid transport!";
+        return;
+    }
+    job->setSender(mSenderEdit->text());
+    job->setTo(mToEdit->text().isEmpty() ? QStringList() : mToEdit->text().split(QLatin1Char(',')));
+    job->setCc(mCcEdit->text().isEmpty() ? QStringList() : mCcEdit->text().split(QLatin1Char(',')));
+    job->setBcc(mBccEdit->text().isEmpty() ? QStringList() : mBccEdit->text().split(QLatin1Char(',')));
+    job->setData(mMailEdit->document()->toPlainText().toLatin1());
+    connect(job, SIGNAL(result(KJob *)),
+            SLOT(jobResult(KJob *)));
+    connect(job, SIGNAL(percent(KJob *,ulong)),
+            SLOT(jobPercent(KJob *,ulong)));
+    connect(job, SIGNAL(infoMessage(KJob *,QString,QString)),
+            SLOT(jobInfoMessage(KJob *,QString,QString)));
+    mCurrentJob = job;
+    TransportManager::self()->schedule(job);
+}
+
+void TransportMgr::cancelBtnClicked()
+{
+    if (mCurrentJob) {
+        qDebug() << "kill success:" << mCurrentJob->kill();
+    }
+    mCurrentJob = nullptr;
+}
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    app.setApplicationName(QStringLiteral("transportmgr"));
+
+    TransportMgr *t = new TransportMgr();
+    t->show();
+    app.exec();
+    delete t;
+}
+
+void TransportMgr::jobResult(KJob *job)
+{
+    qDebug() << job->error() << job->errorText();
+    mCurrentJob = nullptr;
+}
+
+void TransportMgr::jobPercent(KJob *job, unsigned long percent)
+{
+    Q_UNUSED(job);
+    qDebug() << percent << "%";
+}
+
+void TransportMgr::jobInfoMessage(KJob *job, const QString &info, const QString &info2)
+{
+    Q_UNUSED(job);
+    qDebug() << info;
+    qDebug() << info2;
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransport/tests/transportmgr.h kmailtransport-17.04.3/src/kmailtransport/tests/transportmgr.h
--- kmailtransport-16.12.3/src/kmailtransport/tests/transportmgr.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/tests/transportmgr.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,55 @@
+/*
+    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef TRANSPORTMGR_H
+#define TRANSPORTMGR_H
+
+#define USES_DEPRECATED_MAILTRANSPORT_API
+
+#include <QWidget>
+#include <widgets/transportcombobox.h>
+
+class KJob;
+class QLineEdit;
+class KTextEdit;
+
+class TransportMgr : public QWidget
+{
+    Q_OBJECT
+
+public:
+    TransportMgr();
+
+private Q_SLOTS:
+    void removeAllBtnClicked();
+    void editBtnClicked();
+    void sendBtnClicked();
+    void cancelBtnClicked();
+    void jobResult(KJob *job);
+    void jobPercent(KJob *job, unsigned long percent);
+    void jobInfoMessage(KJob *job, const QString &info, const QString &info2);
+
+private:
+    MailTransport::TransportComboBox *mComboBox;
+    QLineEdit *mSenderEdit, *mToEdit, *mCcEdit, *mBccEdit;
+    KTextEdit *mMailEdit;
+    KJob *mCurrentJob;
+};
+
+#endif
diff -Nru kmailtransport-16.12.3/src/kmailtransport/transportbase.kcfgc kmailtransport-17.04.3/src/kmailtransport/transportbase.kcfgc
--- kmailtransport-16.12.3/src/kmailtransport/transportbase.kcfgc	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/transportbase.kcfgc	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,9 @@
+File=mailtransport.kcfg
+ClassName=TransportBase
+NameSpace=MailTransport
+Mutators=true
+ItemAccessors=true
+SetUserTexts=true
+Visibility=MAILTRANSPORT_EXPORT
+IncludeFiles=mailtransport_export.h,KLocalizedString
+TranslationDomain=libmailtransport5
diff -Nru kmailtransport-16.12.3/src/kmailtransport/transport.cpp kmailtransport-17.04.3/src/kmailtransport/transport.cpp
--- kmailtransport-16.12.3/src/kmailtransport/transport.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/transport.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,343 @@
+/*
+    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "transport.h"
+#include "transport_p.h"
+#include "mailtransport_defs.h"
+#include "transportmanager.h"
+#include "transporttype_p.h"
+
+#include <QTimer>
+
+#include <KConfigGroup>
+#include "mailtransport_debug.h"
+#include <KLocalizedString>
+#include <KMessageBox>
+#include <KStringHandler>
+#include <KWallet/KWallet>
+
+using namespace MailTransport;
+using namespace KWallet;
+
+Transport::Transport(const QString &cfgGroup)
+    : TransportBase(cfgGroup)
+    , d(new TransportPrivate)
+{
+    qCDebug(MAILTRANSPORT_LOG) << cfgGroup;
+    d->passwordLoaded = false;
+    d->passwordDirty = false;
+    d->storePasswordInFile = false;
+    d->needsWalletMigration = false;
+    d->passwordNeedsUpdateFromWallet = false;
+    load();
+}
+
+Transport::~Transport()
+{
+    delete d;
+}
+
+bool Transport::isValid() const
+{
+    return (id() > 0) && !host().isEmpty() && port() <= 65536;
+}
+
+QString Transport::password()
+{
+    if (!d->passwordLoaded && requiresAuthentication() && storePassword()
+        && d->password.isEmpty()) {
+        readPassword();
+    }
+    return d->password;
+}
+
+void Transport::setPassword(const QString &passwd)
+{
+    d->passwordLoaded = true;
+    if (d->password == passwd) {
+        return;
+    }
+    d->passwordDirty = true;
+    d->password = passwd;
+}
+
+void Transport::forceUniqueName()
+{
+    QStringList existingNames;
+    foreach (Transport *t, TransportManager::self()->transports()) {
+        if (t->id() != id()) {
+            existingNames << t->name();
+        }
+    }
+    int suffix = 1;
+    QString origName = name();
+    while (existingNames.contains(name())) {
+        setName(i18nc("%1: name; %2: number appended to it to make "
+                      "it unique among a list of names", "%1 #%2", origName, suffix));
+        ++suffix;
+    }
+}
+
+void Transport::updatePasswordState()
+{
+    Transport *original = TransportManager::self()->transportById(id(), false);
+    if (original == this) {
+        qCWarning(MAILTRANSPORT_LOG) << "Tried to update password state of non-cloned transport.";
+        return;
+    }
+    if (original) {
+        d->password = original->d->password;
+        d->passwordLoaded = original->d->passwordLoaded;
+        d->passwordDirty = original->d->passwordDirty;
+    } else {
+        qCWarning(MAILTRANSPORT_LOG) << "Transport with this ID not managed by transport manager.";
+    }
+}
+
+bool Transport::isComplete() const
+{
+    return !requiresAuthentication() || !storePassword() || d->passwordLoaded;
+}
+
+QString Transport::authenticationTypeString() const
+{
+    return Transport::authenticationTypeString(authenticationType());
+}
+
+QString Transport::authenticationTypeString(int type)
+{
+    switch (type) {
+    case EnumAuthenticationType::LOGIN:
+        return QStringLiteral("LOGIN");
+    case EnumAuthenticationType::PLAIN:
+        return QStringLiteral("PLAIN");
+    case EnumAuthenticationType::CRAM_MD5:
+        return QStringLiteral("CRAM-MD5");
+    case EnumAuthenticationType::DIGEST_MD5:
+        return QStringLiteral("DIGEST-MD5");
+    case EnumAuthenticationType::NTLM:
+        return QStringLiteral("NTLM");
+    case EnumAuthenticationType::GSSAPI:
+        return QStringLiteral("GSSAPI");
+    case EnumAuthenticationType::CLEAR:
+        return i18nc("Authentication method", "Clear text");
+    case EnumAuthenticationType::APOP:
+        return QStringLiteral("APOP");
+    case EnumAuthenticationType::ANONYMOUS:
+        return i18nc("Authentication method", "Anonymous");
+    }
+    Q_ASSERT(false);
+    return QString();
+}
+
+void Transport::usrRead()
+{
+    TransportBase::usrRead();
+
+    setHost(host().trimmed());
+
+    if (d->oldName.isEmpty()) {
+        d->oldName = name();
+    }
+
+    // Set TransportType.
+    {
+        d->transportType = TransportType();
+        d->transportType.d->mType = type();
+        qCDebug(MAILTRANSPORT_LOG) << "type" << type();
+        // Now we have the type and possibly agentType.  Get the name, description
+        // etc. from TransportManager.
+        const TransportType::List &types = TransportManager::self()->types();
+        int index = types.indexOf(d->transportType);
+        if (index != -1) {
+            d->transportType = types[ index ];
+        } else {
+            qCWarning(MAILTRANSPORT_LOG) << "Type unknown to manager.";
+            d->transportType.d->mName = i18nc("An unknown transport type", "Unknown");
+        }
+    }
+
+    // we have everything we need
+    if (!storePassword()) {
+        return;
+    }
+
+    if (d->passwordLoaded) {
+        if (d->passwordNeedsUpdateFromWallet) {
+            d->passwordNeedsUpdateFromWallet = false;
+            // read password if wallet is open, defer otherwise
+            if (Wallet::isOpen(Wallet::NetworkWallet())) {
+                // Don't read the password right away because this can lead
+                // to reentrancy problems in KDBusServiceStarter when an application
+                // run in Kontact creates the transports (due to a QEventLoop in the
+                // synchronous KWallet openWallet call).
+                QTimer::singleShot(0, this, &Transport::readPassword);
+            } else {
+                d->passwordLoaded = false;
+            }
+        }
+
+        return;
+    }
+
+    // try to find a password in the config file otherwise
+    KConfigGroup group(config(), currentGroup());
+    if (group.hasKey("password")) {
+        d->password = KStringHandler::obscure(group.readEntry("password"));
+    } else if (group.hasKey("password-kmail")) { //Legacy
+        d->password = KStringHandler::obscure(group.readEntry("password-kmail"));
+    }
+
+    if (!d->password.isEmpty()) {
+        d->passwordLoaded = true;
+        if (Wallet::isEnabled()) {
+            d->needsWalletMigration = true;
+        } else {
+            d->storePasswordInFile = true;
+        }
+    }
+}
+
+bool Transport::usrSave()
+{
+    if (requiresAuthentication() && storePassword() && d->passwordDirty) {
+        const QString storePassword = d->password;
+        Wallet *wallet = TransportManager::self()->wallet();
+        if (!wallet || wallet->writePassword(QString::number(id()), d->password) != 0) {
+            // wallet saving failed, ask if we should store in the config file instead
+            if (d->storePasswordInFile || KMessageBox::warningYesNo(
+                    nullptr,
+                    i18n("KWallet is not available. It is strongly recommended to use "
+                         "KWallet for managing your passwords.\n"
+                         "However, the password can be stored in the configuration "
+                         "file instead. The password is stored in an obfuscated format, "
+                         "but should not be considered secure from decryption efforts "
+                         "if access to the configuration file is obtained.\n"
+                         "Do you want to store the password for server '%1' in the "
+                         "configuration file?", name()),
+                    i18n("KWallet Not Available"),
+                    KGuiItem(i18n("Store Password")),
+                    KGuiItem(i18n("Do Not Store Password"))) == KMessageBox::Yes) {
+                // write to config file
+                KConfigGroup group(config(), currentGroup());
+                group.writeEntry("password", KStringHandler::obscure(storePassword));
+                d->storePasswordInFile = true;
+            }
+        }
+        d->passwordDirty = false;
+    }
+
+    if (!TransportBase::usrSave()) {
+        return false;
+    }
+    TransportManager::self()->emitChangesCommitted();
+    if (name() != d->oldName) {
+        emit TransportManager::self()->transportRenamed(id(), d->oldName, name());
+        d->oldName = name();
+    }
+
+    return true;
+}
+
+void Transport::readPassword()
+{
+    // no need to load a password if the account doesn't require auth
+    if (!requiresAuthentication()) {
+        return;
+    }
+    d->passwordLoaded = true;
+
+    // check whether there is a chance to find our password at all
+    if (Wallet::folderDoesNotExist(Wallet::NetworkWallet(), WALLET_FOLDER)
+        || Wallet::keyDoesNotExist(Wallet::NetworkWallet(), WALLET_FOLDER,
+                                   QString::number(id()))) {
+        // try migrating password from kmail
+        if (Wallet::folderDoesNotExist(Wallet::NetworkWallet(), KMAIL_WALLET_FOLDER)
+            || Wallet::keyDoesNotExist(Wallet::NetworkWallet(), KMAIL_WALLET_FOLDER,
+                                       QStringLiteral("transport-%1").arg(id()))) {
+            return;
+        }
+        qCDebug(MAILTRANSPORT_LOG) << "migrating password from kmail wallet";
+        KWallet::Wallet *wallet = TransportManager::self()->wallet();
+        if (wallet) {
+            QString pwd;
+            wallet->setFolder(KMAIL_WALLET_FOLDER);
+            if (wallet->readPassword(QStringLiteral("transport-%1").arg(id()), pwd) == 0) {
+                setPassword(pwd);
+                save();
+            } else {
+                d->password.clear();
+                d->passwordLoaded = false;
+            }
+            wallet->removeEntry(QStringLiteral("transport-%1").arg(id()));
+            wallet->setFolder(WALLET_FOLDER);
+        }
+        return;
+    }
+
+    // finally try to open the wallet and read the password
+    KWallet::Wallet *wallet = TransportManager::self()->wallet();
+    if (wallet) {
+        QString pwd;
+        if (wallet->readPassword(QString::number(id()), pwd) == 0) {
+            setPassword(pwd);
+        } else {
+            d->password.clear();
+            d->passwordLoaded = false;
+        }
+    }
+}
+
+bool Transport::needsWalletMigration() const
+{
+    return d->needsWalletMigration;
+}
+
+void Transport::migrateToWallet()
+{
+    qCDebug(MAILTRANSPORT_LOG) << "migrating" << id() << "to wallet";
+    d->needsWalletMigration = false;
+    KConfigGroup group(config(), currentGroup());
+    group.deleteEntry("password");
+    group.deleteEntry("password-kmail");
+    d->passwordDirty = true;
+    d->storePasswordInFile = false;
+    save();
+}
+
+Transport *Transport::clone() const
+{
+    QString id = currentGroup().mid(10);
+    return new Transport(id);
+}
+
+TransportType Transport::transportType() const
+{
+    if (!d->transportType.isValid()) {
+        qCWarning(MAILTRANSPORT_LOG) << "Invalid transport type.";
+    }
+    return d->transportType;
+}
+
+void Transport::setTransportType(const TransportType &type)
+{
+    Q_ASSERT(type.isValid());
+    d->transportType = type;
+    setType(type.type());
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransport/transport.h kmailtransport-17.04.3/src/kmailtransport/transport.h
--- kmailtransport-16.12.3/src/kmailtransport/transport.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/transport.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,164 @@
+/*
+    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_TRANSPORT_H
+#define MAILTRANSPORT_TRANSPORT_H
+
+#include <mailtransport_export.h>
+#include <transportbase.h>
+#include <transporttype.h>
+
+class TransportPrivate;
+
+namespace MailTransport {
+class TransportType;
+
+/**
+  Represents the settings of a specific mail transport.
+
+  To create a new empty Transport object, use TransportManager::createTransport().
+
+  Initialize an empty Transport object by calling the set...() methods defined in
+  kcfg-generated TransportBase, and in this class.
+*/
+class MAILTRANSPORT_EXPORT Transport : public TransportBase
+{
+    Q_OBJECT
+    friend class TransportManager;
+    friend class TransportManagerPrivate;
+
+public:
+    /**
+      Destructor
+    */
+    virtual ~Transport();
+
+    typedef QList<Transport *> List;
+
+    /**
+      Returns true if this transport is valid, ie. has all necessary data set.
+    */
+    bool isValid() const;
+
+    /**
+      Returns the password of this transport.
+    */
+    QString password();
+
+    /**
+      Sets the password of this transport.
+      @param passwd The new password.
+    */
+    void setPassword(const QString &passwd);
+
+    /**
+      Makes sure the transport has a unique name.  Adds #1, #2, #3 etc. if
+      necessary.
+      @since 4.4
+    */
+    void forceUniqueName();
+
+    /**
+      This function synchronizes the password of this transport with the
+      password of the transport with the same ID that is managed by the
+      transport manager. This is only useful for cloned transports, since
+      their passwords don't automatically get updated when calling
+      TransportManager::loadPasswordsAsync() or TransportManager::loadPasswords().
+
+      @sa clone()
+      @since 4.2
+    */
+    void updatePasswordState();
+
+    /**
+      Returns true if all settings have been loaded.
+      This is the way to find out if the password has already been loaded
+      from the wallet.
+    */
+    bool isComplete() const;
+
+    /**
+      Returns a string representation of the authentication type.
+    */
+    QString authenticationTypeString() const;
+
+    /**
+      Returns a string representation of the authentication type.
+      Convienence function when there isn't a Transport object
+      instantiated.
+
+      @since 4.5
+    */
+    static QString authenticationTypeString(int type);
+
+    /**
+      Returns a deep copy of this Transport object which will no longer be
+      automatically updated. Use this if you need to store a Transport object
+      over a longer time. However it is recommended to store transport identifiers
+      instead if possible.
+
+      @sa updatePasswordState()
+    */
+    Transport *clone() const;
+
+    /**
+      Returns the type of this transport.
+      @see TransportType.
+      @since 4.4
+    */
+    TransportType transportType() const;
+
+    /**
+      Sets the type of this transport.
+      @see TransportType.
+      @since 4.4
+    */
+    void setTransportType(const TransportType &type);
+
+protected:
+    /**
+      Creates a Transport object. Should only be used by TransportManager.
+      @param cfgGroup The KConfig group to read its data from.
+    */
+    Transport(const QString &cfgGroup);
+
+    void usrRead() Q_DECL_OVERRIDE;
+    bool usrSave() Q_DECL_OVERRIDE;
+
+    /**
+      Returns true if the password was not stored in the wallet.
+    */
+    bool needsWalletMigration() const;
+
+    /**
+      Try to migrate the password from the config file to the wallet.
+    */
+    void migrateToWallet();
+
+private Q_SLOTS:
+
+    // Used by our friend, TransportManager
+    void readPassword();
+
+private:
+    TransportPrivate *const d;
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_TRANSPORT_H
diff -Nru kmailtransport-16.12.3/src/kmailtransport/transportjob.cpp kmailtransport-17.04.3/src/kmailtransport/transportjob.cpp
--- kmailtransport-16.12.3/src/kmailtransport/transportjob.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/transportjob.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,137 @@
+/*
+    Copyright (c) 2007 Volker Krause <vkrause@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "transportjob.h"
+#include "transport.h"
+
+#include <QBuffer>
+
+#include <KLocalizedString>
+
+using namespace MailTransport;
+
+class Q_DECL_HIDDEN MailTransport::TransportJob::Private
+{
+public:
+    Private()
+        : transport(nullptr)
+        , buffer(nullptr)
+    {
+    }
+
+    Transport *transport;
+    QString sender;
+    QStringList to;
+    QStringList cc;
+    QStringList bcc;
+    QByteArray data;
+    QBuffer *buffer;
+};
+
+TransportJob::TransportJob(Transport *transport, QObject *parent)
+    : KCompositeJob(parent)
+    , d(new Private)
+{
+    d->transport = transport;
+    d->buffer = nullptr;
+}
+
+TransportJob::~TransportJob()
+{
+    delete d->transport;
+    delete d;
+}
+
+void TransportJob::setSender(const QString &sender)
+{
+    d->sender = sender;
+}
+
+void TransportJob::setTo(const QStringList &to)
+{
+    d->to = to;
+}
+
+void TransportJob::setCc(const QStringList &cc)
+{
+    d->cc = cc;
+}
+
+void TransportJob::setBcc(const QStringList &bcc)
+{
+    d->bcc = bcc;
+}
+
+void TransportJob::setData(const QByteArray &data)
+{
+    d->data = data;
+}
+
+Transport *TransportJob::transport() const
+{
+    return d->transport;
+}
+
+QString TransportJob::sender() const
+{
+    return d->sender;
+}
+
+QStringList TransportJob::to() const
+{
+    return d->to;
+}
+
+QStringList TransportJob::cc() const
+{
+    return d->cc;
+}
+
+QStringList TransportJob::bcc() const
+{
+    return d->bcc;
+}
+
+QByteArray TransportJob::data() const
+{
+    return d->data;
+}
+
+QBuffer *TransportJob::buffer()
+{
+    if (!d->buffer) {
+        d->buffer = new QBuffer(this);
+        d->buffer->setData(d->data);
+        d->buffer->open(QIODevice::ReadOnly);
+        Q_ASSERT(d->buffer->isOpen());
+    }
+    return d->buffer;
+}
+
+void TransportJob::start()
+{
+    if (!transport()->isValid()) {
+        setError(UserDefinedError);
+        setErrorText(i18n("The outgoing account \"%1\" is not correctly configured.",
+                          transport()->name()));
+        emitResult();
+        return;
+    }
+    doStart();
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransport/transportjob.h kmailtransport-17.04.3/src/kmailtransport/transportjob.h
--- kmailtransport-16.12.3/src/kmailtransport/transportjob.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/transportjob.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,147 @@
+/*
+  Copyright (c) 2007 Volker Krause <vkrause@kde.org>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_TRANSPORTJOB_H
+#define MAILTRANSPORT_TRANSPORTJOB_H
+
+#include <mailtransport_export.h>
+
+#include <QtCore/QStringList>
+
+#include <KCompositeJob>
+
+class QBuffer;
+
+namespace MailTransport {
+class Transport;
+
+/**
+  Abstract base class for all mail transport jobs.
+  This is a job that is supposed to send exactly one mail.
+
+  @deprecated Use MessageQueueJob for sending e-mail.
+*/
+class MAILTRANSPORT_DEPRECATED_EXPORT TransportJob : public KCompositeJob
+{
+    Q_OBJECT
+    friend class TransportManager;
+
+public:
+    /**
+      Deletes this transport job.
+    */
+    virtual ~TransportJob();
+
+    /**
+      Sets the sender of the mail.
+      @p sender must be the plain email address, not including display name.
+    */
+    void setSender(const QString &sender);
+
+    /**
+      Sets the "To" receiver(s) of the mail.
+      @p to must be the plain email address(es), not including display name.
+    */
+    void setTo(const QStringList &to);
+
+    /**
+      Sets the "Cc" receiver(s) of the mail.
+      @p cc must be the plain email address(es), not including display name.
+    */
+    void setCc(const QStringList &cc);
+
+    /**
+      Sets the "Bcc" receiver(s) of the mail.
+      @p bcc must be the plain email address(es), not including display name.
+    */
+    void setBcc(const QStringList &bcc);
+
+    /**
+      Sets the content of the mail.
+    */
+    void setData(const QByteArray &data);
+
+    /**
+      Starts this job. It is recommended to not call this method directly but use
+      TransportManager::schedule() to execute the job instead.
+
+      @see TransportManager::schedule()
+    */
+    void start() Q_DECL_OVERRIDE;
+
+    /**
+      Returns the Transport object containing the mail transport settings.
+    */
+    Transport *transport() const;
+
+protected:
+    /**
+      Creates a new mail transport job.
+      @param transport The transport configuration. This must be a deep copy of
+      a Transport object, the job takes the ownership of this object.
+      @param parent The parent object.
+      @see TransportManager::createTransportJob()
+    */
+    explicit TransportJob(Transport *transport, QObject *parent = nullptr);
+
+    /**
+      Returns the sender of the mail.
+    */
+    QString sender() const;
+
+    /**
+      Returns the "To" receiver(s) of the mail.
+    */
+    QStringList to() const;
+
+    /**
+      Returns the "Cc" receiver(s) of the mail.
+    */
+    QStringList cc() const;
+
+    /**
+      Returns the "Bcc" receiver(s) of the mail.
+    */
+    QStringList bcc() const;
+
+    /**
+      Returns the data of the mail.
+    */
+    QByteArray data() const;
+
+    /**
+      Returns a QBuffer opened on the message data. This is useful for
+      processing the data in smaller chunks.
+    */
+    QBuffer *buffer();
+
+    /**
+      Do the actual work, implement in your subclass.
+    */
+    virtual void doStart() = 0;
+
+private:
+    //@cond PRIVATE
+    class Private;
+    Private *const d;
+    //@endcond
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_TRANSPORTJOB_H
diff -Nru kmailtransport-16.12.3/src/kmailtransport/transportmanager.cpp kmailtransport-17.04.3/src/kmailtransport/transportmanager.cpp
--- kmailtransport-16.12.3/src/kmailtransport/transportmanager.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/transportmanager.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,699 @@
+/*
+  Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#include "transportmanager.h"
+#include "mailtransport_defs.h"
+#include "smtpjob.h"
+#include "transport.h"
+#include "transport_p.h"
+#include "transportjob.h"
+#include "transporttype.h"
+#include "transporttype_p.h"
+#include "widgets/addtransportdialog.h"
+#include "widgets/transportconfigdialog.h"
+#include "widgets/transportconfigwidget.h"
+#include "widgets/smtpconfigwidget.h"
+#include "helper_p.h"
+
+#include <QApplication>
+#include <QtDBus/QDBusConnection>
+#include <QtDBus/QDBusConnectionInterface>
+#include <QtDBus/QDBusServiceWatcher>
+#include <QPointer>
+#include <QRegExp>
+#include <QStringList>
+
+#include <KConfig>
+#include <KConfigGroup>
+#include "mailtransport_debug.h"
+#include <KEMailSettings>
+#include <KLocalizedString>
+#include <KMessageBox>
+#include <KRandom>
+#include <Kdelibs4ConfigMigrator>
+
+#include <KWallet/kwallet.h>
+
+using namespace MailTransport;
+using namespace KWallet;
+
+namespace MailTransport {
+/**
+ * Private class that helps to provide binary compatibility between releases.
+ * @internal
+ */
+class TransportManagerPrivate
+{
+public:
+    TransportManagerPrivate(TransportManager *parent)
+        : config(nullptr)
+        , wallet(nullptr)
+        , q(parent)
+    {
+    }
+
+    ~TransportManagerPrivate()
+    {
+        delete config;
+        qDeleteAll(transports);
+    }
+
+    KConfig *config;
+    QList<Transport *> transports;
+    TransportType::List types;
+    bool myOwnChange;
+    bool appliedChange;
+    KWallet::Wallet *wallet;
+    bool walletOpenFailed;
+    bool walletAsyncOpen;
+    int defaultTransportId;
+    bool isMainInstance;
+    QList<TransportJob *> walletQueue;
+    TransportManager *q;
+
+    void readConfig();
+    void writeConfig();
+    void fillTypes();
+    int createId() const;
+    void prepareWallet();
+    void validateDefault();
+    void migrateToWallet();
+
+    // Slots
+    void slotTransportsChanged();
+    void slotWalletOpened(bool success);
+    void dbusServiceUnregistered();
+    void jobResult(KJob *job);
+};
+}
+
+class StaticTransportManager : public TransportManager
+{
+public:
+    StaticTransportManager() : TransportManager()
+    {
+    }
+};
+
+StaticTransportManager *sSelf = nullptr;
+
+static void destroyStaticTransportManager()
+{
+    delete sSelf;
+}
+
+TransportManager::TransportManager()
+    : QObject()
+    , d(new TransportManagerPrivate(this))
+{
+    Kdelibs4ConfigMigrator migrate(QStringLiteral("transportmanager"));
+    migrate.setConfigFiles(QStringList() << QStringLiteral("mailtransports"));
+    migrate.migrate();
+
+    qAddPostRoutine(destroyStaticTransportManager);
+    d->myOwnChange = false;
+    d->appliedChange = false;
+    d->wallet = nullptr;
+    d->walletOpenFailed = false;
+    d->walletAsyncOpen = false;
+    d->defaultTransportId = -1;
+    d->config = new KConfig(QStringLiteral("mailtransports"));
+
+    QDBusConnection::sessionBus().registerObject(DBUS_OBJECT_PATH, this,
+                                                 QDBusConnection::ExportScriptableSlots
+                                                 |QDBusConnection::ExportScriptableSignals);
+
+    QDBusServiceWatcher *watcher
+        = new QDBusServiceWatcher(DBUS_SERVICE_NAME, QDBusConnection::sessionBus(),
+                                  QDBusServiceWatcher::WatchForUnregistration, this);
+    connect(watcher, SIGNAL(serviceUnregistered(QString)),
+            SLOT(dbusServiceUnregistered()));
+
+    QDBusConnection::sessionBus().connect(QString(), QString(),
+                                          DBUS_INTERFACE_NAME, DBUS_CHANGE_SIGNAL,
+                                          this, SLOT(slotTransportsChanged()));
+
+    d->isMainInstance = QDBusConnection::sessionBus().registerService(DBUS_SERVICE_NAME);
+
+    d->fillTypes();
+}
+
+TransportManager::~TransportManager()
+{
+    qRemovePostRoutine(destroyStaticTransportManager);
+    delete d;
+}
+
+TransportManager *TransportManager::self()
+{
+    if (!sSelf) {
+        sSelf = new StaticTransportManager;
+        sSelf->d->readConfig();
+    }
+    return sSelf;
+}
+
+Transport *TransportManager::transportById(int id, bool def) const
+{
+    foreach (Transport *t, d->transports) {
+        if (t->id() == id) {
+            return t;
+        }
+    }
+
+    if (def || (id == 0 && d->defaultTransportId != id)) {
+        return transportById(d->defaultTransportId, false);
+    }
+    return nullptr;
+}
+
+Transport *TransportManager::transportByName(const QString &name, bool def) const
+{
+    foreach (Transport *t, d->transports) {
+        if (t->name() == name) {
+            return t;
+        }
+    }
+    if (def) {
+        return transportById(0, false);
+    }
+    return nullptr;
+}
+
+QList< Transport * > TransportManager::transports() const
+{
+    return d->transports;
+}
+
+TransportType::List TransportManager::types() const
+{
+    return d->types;
+}
+
+Transport *TransportManager::createTransport() const
+{
+    int id = d->createId();
+    Transport *t = new Transport(QString::number(id));
+    t->setId(id);
+    return t;
+}
+
+void TransportManager::addTransport(Transport *transport)
+{
+    if (d->transports.contains(transport)) {
+        qCDebug(MAILTRANSPORT_LOG) << "Already have this transport.";
+        return;
+    }
+
+    qCDebug(MAILTRANSPORT_LOG) << "Added transport" << transport;
+    d->transports.append(transport);
+    d->validateDefault();
+    emitChangesCommitted();
+}
+
+void TransportManager::schedule(TransportJob *job)
+{
+    connect(job, SIGNAL(result(KJob *)), SLOT(jobResult(KJob *)));
+
+    // check if the job is waiting for the wallet
+    if (!job->transport()->isComplete()) {
+        qCDebug(MAILTRANSPORT_LOG) << "job waits for wallet:" << job;
+        d->walletQueue << job;
+        loadPasswordsAsync();
+        return;
+    }
+
+    job->start();
+}
+
+void TransportManager::createDefaultTransport()
+{
+    KEMailSettings kes;
+    Transport *t = createTransport();
+    t->setName(i18n("Default Transport"));
+    t->setHost(kes.getSetting(KEMailSettings::OutServer));
+    if (t->isValid()) {
+        t->save();
+        addTransport(t);
+    } else {
+        qCWarning(MAILTRANSPORT_LOG) << "KEMailSettings does not contain a valid transport.";
+    }
+}
+
+bool TransportManager::showTransportCreationDialog(QWidget *parent, ShowCondition showCondition)
+{
+    if (showCondition == IfNoTransportExists) {
+        if (!isEmpty()) {
+            return true;
+        }
+
+        const int response = KMessageBox::messageBox(parent,
+                                                     KMessageBox::WarningContinueCancel,
+                                                     i18n("You must create an outgoing account before sending."),
+                                                     i18n("Create Account Now?"),
+                                                     KGuiItem(i18n("Create Account Now")));
+        if (response != KMessageBox::Continue) {
+            return false;
+        }
+    }
+
+    QPointer<AddTransportDialog> dialog = new AddTransportDialog(parent);
+    const bool accepted = (dialog->exec() == QDialog::Accepted);
+    delete dialog;
+    return accepted;
+}
+
+bool TransportManager::configureTransport(Transport *transport, QWidget *parent)
+{
+    QPointer<TransportConfigDialog> transportConfigDialog
+        = new TransportConfigDialog(transport, parent);
+    transportConfigDialog->setWindowTitle(i18n("Configure account"));
+    bool okClicked = (transportConfigDialog->exec() == QDialog::Accepted);
+    delete transportConfigDialog;
+    return okClicked;
+}
+
+TransportJob *TransportManager::createTransportJob(int transportId)
+{
+    Transport *t = transportById(transportId, false);
+    if (!t) {
+        return nullptr;
+    }
+    t = t->clone(); // Jobs delete their transports.
+    t->updatePasswordState();
+    switch (t->type()) {
+    case Transport::EnumType::SMTP:
+        return new SmtpJob(t, this);
+    }
+    Q_ASSERT(false);
+    return nullptr;
+}
+
+TransportJob *TransportManager::createTransportJob(const QString &transport)
+{
+    bool ok = false;
+    Transport *t = nullptr;
+
+    int transportId = transport.toInt(&ok);
+    if (ok) {
+        t = transportById(transportId);
+    }
+
+    if (!t) {
+        t = transportByName(transport, false);
+    }
+
+    if (t) {
+        return createTransportJob(t->id());
+    }
+
+    return nullptr;
+}
+
+bool TransportManager::isEmpty() const
+{
+    return d->transports.isEmpty();
+}
+
+QVector<int> TransportManager::transportIds() const
+{
+    QVector<int> rv;
+    rv.reserve(d->transports.count());
+    foreach (Transport *t, d->transports) {
+        rv << t->id();
+    }
+    return rv;
+}
+
+QStringList TransportManager::transportNames() const
+{
+    QStringList rv;
+    rv.reserve(d->transports.count());
+    foreach (Transport *t, d->transports) {
+        rv << t->name();
+    }
+    return rv;
+}
+
+QString TransportManager::defaultTransportName() const
+{
+    Transport *t = transportById(d->defaultTransportId, false);
+    if (t) {
+        return t->name();
+    }
+    return QString();
+}
+
+int TransportManager::defaultTransportId() const
+{
+    return d->defaultTransportId;
+}
+
+void TransportManager::setDefaultTransport(int id)
+{
+    if (id == d->defaultTransportId || !transportById(id, false)) {
+        return;
+    }
+    d->defaultTransportId = id;
+    d->writeConfig();
+}
+
+void TransportManager::removeTransport(int id)
+{
+    Transport *t = transportById(id, false);
+    if (!t) {
+        return;
+    }
+    emit transportRemoved(t->id(), t->name());
+
+    d->transports.removeAll(t);
+    d->validateDefault();
+    QString group = t->currentGroup();
+    if (t->storePassword()) {
+        Wallet *currentWallet = wallet();
+        if (currentWallet) {
+            currentWallet->removeEntry(QString::number(t->id()));
+        }
+    }
+    delete t;
+    d->config->deleteGroup(group);
+    d->writeConfig();
+}
+
+void TransportManagerPrivate::readConfig()
+{
+    QList<Transport *> oldTransports = transports;
+    transports.clear();
+
+    QRegExp re(QStringLiteral("^Transport (.+)$"));
+    const QStringList groups = config->groupList().filter(re);
+    for (const QString &s : groups) {
+        if (re.indexIn(s) == -1) {
+            continue;
+        }
+        Transport *t = nullptr;
+
+        // see if we happen to have that one already
+        foreach (Transport *old, oldTransports) {
+            if (old->currentGroup() == QLatin1String("Transport ") + re.cap(1)) {
+                qCDebug(MAILTRANSPORT_LOG) << "reloading existing transport:" << s;
+                t = old;
+                t->d->passwordNeedsUpdateFromWallet = true;
+                t->load();
+                oldTransports.removeAll(old);
+                break;
+            }
+        }
+
+        if (!t) {
+            t = new Transport(re.cap(1));
+        }
+        if (t->id() <= 0) {
+            t->setId(createId());
+            t->save();
+        }
+        transports.append(t);
+    }
+
+    qDeleteAll(oldTransports);
+    oldTransports.clear();
+
+    // read default transport
+    KConfigGroup group(config, "General");
+    defaultTransportId = group.readEntry("default-transport", 0);
+    if (defaultTransportId == 0) {
+        // migrated default transport contains the name instead
+        QString name = group.readEntry("default-transport", QString());
+        if (!name.isEmpty()) {
+            Transport *t = q->transportByName(name, false);
+            if (t) {
+                defaultTransportId = t->id();
+                writeConfig();
+            }
+        }
+    }
+    validateDefault();
+    migrateToWallet();
+    q->loadPasswordsAsync();
+}
+
+void TransportManagerPrivate::writeConfig()
+{
+    KConfigGroup group(config, "General");
+    group.writeEntry("default-transport", defaultTransportId);
+    config->sync();
+    q->emitChangesCommitted();
+}
+
+void TransportManagerPrivate::fillTypes()
+{
+    Q_ASSERT(types.isEmpty());
+
+    // SMTP.
+    {
+        TransportType type;
+        type.d->mType = Transport::EnumType::SMTP;
+        type.d->mName = i18nc("@option SMTP transport", "SMTP");
+        type.d->mDescription = i18n("An SMTP server on the Internet");
+        types << type;
+    }
+}
+
+void TransportManager::emitChangesCommitted()
+{
+    d->myOwnChange = true; // prevent us from reading our changes again
+    d->appliedChange = false; // but we have to read them at least once
+    emit transportsChanged();
+    emit changesCommitted();
+}
+
+void TransportManagerPrivate::slotTransportsChanged()
+{
+    if (myOwnChange && appliedChange) {
+        myOwnChange = false;
+        appliedChange = false;
+        return;
+    }
+
+    qCDebug(MAILTRANSPORT_LOG);
+    config->reparseConfiguration();
+    // FIXME: this deletes existing transport objects!
+    readConfig();
+    appliedChange = true; // to prevent recursion
+    emit q->transportsChanged();
+}
+
+int TransportManagerPrivate::createId() const
+{
+    QVector<int> usedIds;
+    usedIds.reserve(1 + transports.count());
+    for (Transport *t : qAsConst(transports)) {
+        usedIds << t->id();
+    }
+    usedIds << 0; // 0 is default for unknown
+    int newId;
+    do {
+        newId = KRandom::random();
+    } while (usedIds.contains(newId));
+    return newId;
+}
+
+KWallet::Wallet *TransportManager::wallet()
+{
+    if (d->wallet && d->wallet->isOpen()) {
+        return d->wallet;
+    }
+
+    if (!Wallet::isEnabled() || d->walletOpenFailed) {
+        return nullptr;
+    }
+
+    WId window = 0;
+    if (qApp->activeWindow()) {
+        window = qApp->activeWindow()->winId();
+    } else if (!QApplication::topLevelWidgets().isEmpty()) {
+        window = qApp->topLevelWidgets().first()->winId();
+    }
+
+    delete d->wallet;
+    d->wallet = Wallet::openWallet(Wallet::NetworkWallet(), window);
+
+    if (!d->wallet) {
+        d->walletOpenFailed = true;
+        return nullptr;
+    }
+
+    d->prepareWallet();
+    return d->wallet;
+}
+
+void TransportManagerPrivate::prepareWallet()
+{
+    if (!wallet) {
+        return;
+    }
+    if (!wallet->hasFolder(WALLET_FOLDER)) {
+        wallet->createFolder(WALLET_FOLDER);
+    }
+    wallet->setFolder(WALLET_FOLDER);
+}
+
+void TransportManager::loadPasswords()
+{
+    foreach (Transport *t, d->transports) {
+        t->readPassword();
+    }
+
+    // flush the wallet queue
+    const QList<TransportJob *> copy = d->walletQueue;
+    d->walletQueue.clear();
+    for (TransportJob *job : copy) {
+        job->start();
+    }
+
+    emit passwordsChanged();
+}
+
+void TransportManager::loadPasswordsAsync()
+{
+    qCDebug(MAILTRANSPORT_LOG);
+
+    // check if there is anything to do at all
+    bool found = false;
+    foreach (Transport *t, d->transports) {
+        if (!t->isComplete()) {
+            found = true;
+            break;
+        }
+    }
+    if (!found) {
+        return;
+    }
+
+    // async wallet opening
+    if (!d->wallet && !d->walletOpenFailed) {
+        WId window = 0;
+        if (qApp->activeWindow()) {
+            window = qApp->activeWindow()->winId();
+        } else if (!QApplication::topLevelWidgets().isEmpty()) {
+            window = qApp->topLevelWidgets().first()->winId();
+        }
+
+        d->wallet = Wallet::openWallet(Wallet::NetworkWallet(), window,
+                                       Wallet::Asynchronous);
+        if (d->wallet) {
+            connect(d->wallet, SIGNAL(walletOpened(bool)), SLOT(slotWalletOpened(bool)));
+            d->walletAsyncOpen = true;
+        } else {
+            d->walletOpenFailed = true;
+            loadPasswords();
+        }
+        return;
+    }
+    if (d->wallet && !d->walletAsyncOpen) {
+        loadPasswords();
+    }
+}
+
+void TransportManagerPrivate::slotWalletOpened(bool success)
+{
+    qCDebug(MAILTRANSPORT_LOG);
+    walletAsyncOpen = false;
+    if (!success) {
+        walletOpenFailed = true;
+        delete wallet;
+        wallet = nullptr;
+    } else {
+        prepareWallet();
+    }
+    q->loadPasswords();
+}
+
+void TransportManagerPrivate::validateDefault()
+{
+    if (!q->transportById(defaultTransportId, false)) {
+        if (q->isEmpty()) {
+            defaultTransportId = -1;
+        } else {
+            defaultTransportId = transports.first()->id();
+            writeConfig();
+        }
+    }
+}
+
+void TransportManagerPrivate::migrateToWallet()
+{
+    // check if we tried this already
+    static bool firstRun = true;
+    if (!firstRun) {
+        return;
+    }
+    firstRun = false;
+
+    // check if we are the main instance
+    if (!isMainInstance) {
+        return;
+    }
+
+    // check if migration is needed
+    QStringList names;
+    for (Transport *t : qAsConst(transports)) {
+        if (t->needsWalletMigration()) {
+            names << t->name();
+        }
+    }
+    if (names.isEmpty()) {
+        return;
+    }
+
+    // ask user if he wants to migrate
+    int result = KMessageBox::questionYesNoList(
+        nullptr,
+        i18n("The following mail transports store their passwords in an "
+             "unencrypted configuration file.\nFor security reasons, "
+             "please consider migrating these passwords to KWallet, the "
+             "KDE Wallet management tool,\nwhich stores sensitive data "
+             "for you in a strongly encrypted file.\n"
+             "Do you want to migrate your passwords to KWallet?"),
+        names, i18n("Question"),
+        KGuiItem(i18n("Migrate")), KGuiItem(i18n("Keep")),
+        QStringLiteral("WalletMigrate"));
+    if (result != KMessageBox::Yes) {
+        return;
+    }
+
+    // perform migration
+    foreach (Transport *t, transports) {
+        if (t->needsWalletMigration()) {
+            t->migrateToWallet();
+        }
+    }
+}
+
+void TransportManagerPrivate::dbusServiceUnregistered()
+{
+    QDBusConnection::sessionBus().registerService(DBUS_SERVICE_NAME);
+}
+
+void TransportManagerPrivate::jobResult(KJob *job)
+{
+    walletQueue.removeAll(static_cast<TransportJob *>(job));
+}
+
+#include "moc_transportmanager.cpp"
diff -Nru kmailtransport-16.12.3/src/kmailtransport/transportmanager.h kmailtransport-17.04.3/src/kmailtransport/transportmanager.h
--- kmailtransport-16.12.3/src/kmailtransport/transportmanager.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/transportmanager.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,297 @@
+/*
+    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_TRANSPORTMANAGER_H
+#define MAILTRANSPORT_TRANSPORTMANAGER_H
+
+#include <mailtransport_export.h>
+#include <transporttype.h>
+
+#include <QtCore/QList>
+#include <QtCore/QObject>
+
+class KJob;
+
+namespace KWallet {
+class Wallet;
+}
+
+namespace MailTransport {
+class Transport;
+class TransportJob;
+class TransportManagerPrivate;
+
+/**
+  @short Central transport management interface.
+
+  This class manages the creation, configuration, and removal of mail
+  transports, as well as the loading and storing of mail transport settings.
+
+  It also handles the creation of transport jobs, although that behaviour is
+  deprecated and you are encouraged to use MessageQueueJob.
+
+  @see MessageQueueJob.
+*/
+class MAILTRANSPORT_EXPORT TransportManager : public QObject
+{
+    Q_OBJECT
+    Q_CLASSINFO("D-Bus Interface", "org.kde.pim.TransportManager")
+
+    friend class Transport;
+    friend class TransportManagerPrivate;
+
+public:
+
+    /**
+      Destructor.
+    */
+    virtual ~TransportManager();
+
+    /**
+      Returns the TransportManager instance.
+    */
+    static TransportManager *self();
+
+    /**
+      Tries to load passwords asynchronously from KWallet if needed.
+      The passwordsChanged() signal is emitted once the passwords have been loaded.
+      Nothing happens if the passwords were already available.
+    */
+    void loadPasswordsAsync();
+
+    /**
+      Returns the Transport object with the given id.
+      @param id The identifier of the Transport.
+      @param def if set to true, the default transport will be returned if the
+      specified Transport object could not be found, 0 otherwise.
+      @returns A Transport object for immediate use. It might become invalid as
+      soon as the event loop is entered again due to remote changes. If you need
+      to store a Transport object, store the transport identifier instead.
+    */
+    Transport *transportById(int id, bool def = true) const;
+
+    /**
+      Returns the transport object with the given name.
+      @param name The transport name.
+      @param def if set to true, the default transport will be returned if the
+      specified Transport object could not be found, 0 otherwise.
+      @returns A Transport object for immediate use, see transportById() for
+      limitations.
+    */
+    Transport *transportByName(const QString &name, bool def = true) const;
+
+    /**
+      Returns a list of all available transports.
+      Note: The Transport objects become invalid as soon as a change occur, so
+      they are only suitable for immediate use.
+    */
+    QList<Transport *> transports() const;
+
+    /**
+      Returns a list of all available transport types.
+    */
+    TransportType::List types() const;
+
+    /**
+      Creates a new, empty Transport object. The object is owned by the caller.
+      If you want to add the Transport permanently (eg. after configuring it)
+      call addTransport().
+    */
+    Transport *createTransport() const;
+
+    /**
+      Adds the given transport. The object ownership is transferred to
+      TransportMananger, ie. you must not delete @p transport.
+      @param transport The Transport object to add.
+    */
+    void addTransport(Transport *transport);
+
+    /**
+      Creates a mail transport job for the given transport identifier.
+      Returns 0 if the specified transport is invalid.
+      @param transportId The transport identifier.
+
+      @deprecated use MessageQueueJob to queue messages
+                  and rely on the Dispatcher Agent to send them.
+    */
+    MAILTRANSPORT_DEPRECATED TransportJob *createTransportJob(int transportId);
+
+    /**
+      Creates a mail transport job for the given transport identifer,
+      or transport name.
+      Returns 0 if the specified transport is invalid.
+      @param transport A string defining a mail transport.
+
+      @deprecated use MessageQueueJob to queue messages
+                  and rely on the Dispatcher Agent to send them.
+    */
+    MAILTRANSPORT_DEPRECATED TransportJob *createTransportJob(const QString &transport);
+
+    /**
+      Executes the given transport job. This is the preferred way to start
+      transport jobs. It takes care of asynchronously loading passwords from
+      KWallet if necessary.
+      @param job The completely configured transport job to execute.
+
+      @deprecated use MessageQueueJob to queue messages
+                  and rely on the Dispatcher Agent to send them.
+    */
+    MAILTRANSPORT_DEPRECATED void schedule(TransportJob *job);
+
+    /**
+      Tries to create a transport based on KEMailSettings.
+      If the data in KEMailSettings is incomplete, no transport is created.
+    */
+    void createDefaultTransport();
+
+    /// Describes when to show the transport creation dialog
+    enum ShowCondition {
+        Always,              ///< Show the transport creation dialog unconditionally
+        IfNoTransportExists  ///< Only show the transport creation dialog if no transport currently
+        ///  exists. Ask the user if he wants to add a transport in
+        ///  the other case.
+    };
+
+    /**
+      Shows a dialog for creating and configuring a new transport.
+      @param parent Parent widget of the dialog.
+      @param showCondition the condition under which the dialog is shown at all
+      @return True if a new transport has been created and configured.
+      @since 4.4
+    */
+    bool showTransportCreationDialog(QWidget *parent, ShowCondition showCondition = Always);
+
+    /**
+      Open a configuration dialog for an existing transport.
+      @param transport The transport to configure.  It can be a new transport,
+                       or one already managed by TransportManager.
+      @param parent The parent widget for the dialog.
+      @return True if the user clicked Ok, false if the user cancelled.
+      @since 4.4
+    */
+    bool configureTransport(Transport *transport, QWidget *parent);
+
+public Q_SLOTS:
+    /**
+      Returns true if there are no mail transports at all.
+    */
+    Q_SCRIPTABLE bool isEmpty() const;
+
+    /**
+      Returns a list of transport identifiers.
+    */
+    Q_SCRIPTABLE QVector<int> transportIds() const;
+
+    /**
+      Returns a list of transport names.
+    */
+    Q_SCRIPTABLE QStringList transportNames() const;
+
+    /**
+      Returns the default transport name.
+    */
+    Q_SCRIPTABLE QString defaultTransportName() const;
+
+    /**
+      Returns the default transport identifier.
+      Invalid if there are no transports at all.
+    */
+    Q_SCRIPTABLE int defaultTransportId() const;
+
+    /**
+      Sets the default transport. The change will be in effect immediately.
+      @param id The identifier of the new default transport.
+    */
+    Q_SCRIPTABLE void setDefaultTransport(int id);
+
+    /**
+      Deletes the specified transport.
+      @param id The identifier of the mail transport to remove.
+    */
+    Q_SCRIPTABLE void removeTransport(int id);
+
+Q_SIGNALS:
+    /**
+      Emitted when transport settings have changed (by this or any other
+      TransportManager instance).
+    */
+    Q_SCRIPTABLE void transportsChanged();
+
+    /**
+      Internal signal to synchronize all TransportManager instances.
+      This signal is emitted by the instance writing the changes.
+      You probably want to use transportsChanged() instead.
+    */
+    Q_SCRIPTABLE void changesCommitted();
+
+    /**
+      Emitted when passwords have been loaded from the wallet.
+      If you made a deep copy of a transport, you should call updatePasswordState()
+      for the cloned transport to ensure its password is updated as well.
+    */
+    void passwordsChanged();
+
+    /**
+      Emitted when a transport is deleted.
+      @param id The identifier of the deleted transport.
+      @param name The name of the deleted transport.
+    */
+    void transportRemoved(int id, const QString &name);
+
+    /**
+      Emitted when a transport has been renamed.
+      @param id The identifier of the renamed transport.
+      @param oldName The old name.
+      @param newName The new name.
+    */
+    void transportRenamed(int id, const QString &oldName, const QString &newName);
+
+protected:
+    /**
+      Returns a pointer to an open wallet if available, 0 otherwise.
+      The wallet is opened synchronously if necessary.
+    */
+    KWallet::Wallet *wallet();
+
+    /**
+      Loads all passwords synchronously.
+    */
+    void loadPasswords();
+
+    /**
+      Singleton class, the only instance resides in the static object sSelf.
+    */
+    TransportManager();
+
+private:
+
+    // These are used by our friend, Transport
+    void emitChangesCommitted();
+
+private:
+    TransportManagerPrivate *const d;
+
+    Q_PRIVATE_SLOT(d, void slotTransportsChanged())
+    Q_PRIVATE_SLOT(d, void slotWalletOpened(bool success))
+    Q_PRIVATE_SLOT(d, void dbusServiceUnregistered())
+    Q_PRIVATE_SLOT(d, void jobResult(KJob *job))
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_TRANSPORTMANAGER_H
diff -Nru kmailtransport-16.12.3/src/kmailtransport/transport_p.h kmailtransport-17.04.3/src/kmailtransport/transport_p.h
--- kmailtransport-16.12.3/src/kmailtransport/transport_p.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/transport_p.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,42 @@
+/*
+    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_TRANSPORT_P_H
+#define MAILTRANSPORT_TRANSPORT_P_H
+
+#include "transporttype.h"
+
+/**
+ * Private class that helps to provide binary compatibility between releases.
+ * @internal
+ */
+class TransportPrivate
+{
+public:
+    MailTransport::TransportType transportType;
+    QString password;
+    QString oldName;
+    bool passwordLoaded;
+    bool passwordDirty;
+    bool storePasswordInFile;
+    bool needsWalletMigration;
+    bool passwordNeedsUpdateFromWallet;
+};
+
+#endif
diff -Nru kmailtransport-16.12.3/src/kmailtransport/transporttype.cpp kmailtransport-17.04.3/src/kmailtransport/transporttype.cpp
--- kmailtransport-16.12.3/src/kmailtransport/transporttype.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/transporttype.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,71 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "transporttype.h"
+#include "transporttype_p.h"
+#include "transport.h"
+
+using namespace MailTransport;
+
+TransportType::TransportType()
+    : d(new Private)
+{
+}
+
+TransportType::TransportType(const TransportType &other)
+    : d(other.d)
+{
+}
+
+TransportType::~TransportType()
+{
+}
+
+TransportType &TransportType::operator=(const TransportType &other)
+{
+    if (this != &other) {
+        d = other.d;
+    }
+    return *this;
+}
+
+bool TransportType::operator==(const TransportType &other) const
+{
+    return d->mType == other.d->mType;
+}
+
+bool TransportType::isValid() const
+{
+    return d->mType >= 0;
+}
+
+TransportBase::EnumType::type TransportType::type() const
+{
+    return static_cast<TransportBase::EnumType::type>(d->mType);
+}
+
+QString TransportType::name() const
+{
+    return d->mName;
+}
+
+QString TransportType::description() const
+{
+    return d->mDescription;
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransport/transporttype.h kmailtransport-17.04.3/src/kmailtransport/transporttype.h
--- kmailtransport-16.12.3/src/kmailtransport/transporttype.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/transporttype.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,112 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_TRANSPORTTYPE_H
+#define MAILTRANSPORT_TRANSPORTTYPE_H
+
+#include "mailtransport_export.h"
+#include "transport.h"
+
+#include <QtCore/QString>
+
+namespace MailTransport {
+class AddTransportDialog;
+class TransportManager;
+
+/**
+  @short A representation of a transport type.
+
+  Represents an available transport type.  SMTP is available
+
+  All available transport types can be retrieved via TransportManager::types().
+
+  @author Constantin Berzan <exit3219@gmail.com>
+  @since 4.4
+*/
+class MAILTRANSPORT_EXPORT TransportType
+{
+    friend class AddTransportDialog;
+    friend class Transport;
+    friend class TransportManager;
+    friend class TransportManagerPrivate;
+
+public:
+    /**
+      Describes a list of transport types.
+    */
+    typedef QVector<TransportType> List;
+
+    /**
+      Constructs a new TransportType.
+    */
+    TransportType();
+
+    /**
+      Creates a copy of the @p other TransportType.
+    */
+    TransportType(const TransportType &other);
+
+    /**
+      Destroys the TransportType.
+    */
+    ~TransportType();
+
+    /**
+     * Replaces the transport type by the @p other.
+     */
+    TransportType &operator=(const TransportType &other);
+
+    /**
+     * Compares the transport type with the @p other.
+     */
+    bool operator==(const TransportType &other) const;
+
+    /**
+      Returns whether the transport type is valid.
+    */
+    bool isValid() const;
+
+    /**
+      @internal
+      Returns the type of the transport.
+    */
+    TransportBase::EnumType::type type() const;
+
+    /**
+      Returns the i18n'ed name of the transport type.
+    */
+    QString name() const;
+
+    /**
+      Returns a description of the transport type.
+    */
+    QString description() const;
+
+private:
+    //@cond PRIVATE
+    class Private;
+    QSharedDataPointer<Private> d;
+    //@endcond
+};
+} // namespace MailTransport
+
+Q_DECLARE_METATYPE(MailTransport::TransportType)
+Q_DECLARE_TYPEINFO(MailTransport::TransportType, Q_MOVABLE_TYPE);
+
+#endif // MAILTRANSPORT_TRANSPORTTYPE_H
diff -Nru kmailtransport-16.12.3/src/kmailtransport/transporttype_p.h kmailtransport-17.04.3/src/kmailtransport/transporttype_p.h
--- kmailtransport-16.12.3/src/kmailtransport/transporttype_p.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/transporttype_p.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,52 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_TRANSPORTTYPE_P_H
+#define MAILTRANSPORT_TRANSPORTTYPE_P_H
+
+#include <QtCore/QSharedData>
+#include <QtCore/QString>
+
+namespace MailTransport {
+/**
+  @internal
+*/
+class TransportType::Private : public QSharedData
+{
+public:
+    Private()
+    {
+        mType = -1;
+    }
+
+    Private(const Private &other)
+        : QSharedData(other)
+    {
+        mType = other.mType;
+        mName = other.mName;
+        mDescription = other.mDescription;
+    }
+
+    int mType;
+    QString mName;
+    QString mDescription;
+};
+} // namespace MailTransport
+
+#endif //MAILTRANSPORT_TRANSPORTTYPE_P_H
diff -Nru kmailtransport-16.12.3/src/kmailtransport/ui/addtransportdialog.ui kmailtransport-17.04.3/src/kmailtransport/ui/addtransportdialog.ui
--- kmailtransport-16.12.3/src/kmailtransport/ui/addtransportdialog.ui	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/ui/addtransportdialog.ui	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AddTransportDialog</class>
+ <widget class="QWidget" name="AddTransportDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>482</width>
+    <height>353</height>
+   </rect>
+  </property>
+  <property name="minimumSize">
+   <size>
+    <width>0</width>
+    <height>0</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Step One: Select Transport Type</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <property name="horizontalSpacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string comment="The name of a mail transport">Name:</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QLineEdit" name="name"/>
+   </item>
+   <item row="1" column="1">
+    <widget class="QCheckBox" name="setDefault">
+     <property name="text">
+      <string>Make this the default outgoing account.</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0" colspan="2">
+    <widget class="QLabel" name="descLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string>Select an account type from the list below:</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="3" column="0" colspan="2">
+    <widget class="QTreeWidget" name="typeListView">
+     <property name="alternatingRowColors">
+      <bool>true</bool>
+     </property>
+     <property name="rootIsDecorated">
+      <bool>false</bool>
+     </property>
+     <column>
+      <property name="text">
+       <string>Type</string>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Description</string>
+      </property>
+     </column>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff -Nru kmailtransport-16.12.3/src/kmailtransport/ui/smtpsettings.ui kmailtransport-17.04.3/src/kmailtransport/ui/smtpsettings.ui
--- kmailtransport-16.12.3/src/kmailtransport/ui/smtpsettings.ui	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/ui/smtpsettings.ui	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,576 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <author>Volker Krause &lt;vkrause@kde.org&gt;, KovoKs &lt;tomalbers@kde.nl&gt;</author>
+ <class>SMTPSettings</class>
+ <widget class="QWidget" name="SMTPSettings">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>411</width>
+    <height>474</height>
+   </rect>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item>
+    <widget class="QTabWidget" name="tabWidget">
+     <property name="currentIndex">
+      <number>0</number>
+     </property>
+     <widget class="QWidget" name="smptTab">
+      <attribute name="title">
+       <string comment="general smtp settings">General</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_2">
+       <item>
+        <widget class="QGroupBox" name="groupBox">
+         <property name="title">
+          <string>Account Information</string>
+         </property>
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="0" column="0">
+           <widget class="QLabel" name="hostLabel">
+            <property name="text">
+             <string>Outgoing &amp;mail server:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="buddy">
+             <cstring>kcfg_host</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="KLineEdit" name="kcfg_host">
+            <property name="trapEnterKeyEvent" stdset="0">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="usernameLabel">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>&amp;Login:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="buddy">
+             <cstring>kcfg_userName</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="KLineEdit" name="kcfg_userName">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="trapEnterKeyEvent" stdset="0">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="passwordLabel">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>P&amp;assword:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="buddy">
+             <cstring>password</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="KLineEdit" name="password">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="whatsThis">
+             <string>The password to send to the server for authorization.</string>
+            </property>
+            <property name="echoMode">
+             <enum>QLineEdit::Password</enum>
+            </property>
+            <property name="trapEnterKeyEvent" stdset="0">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="QCheckBox" name="kcfg_storePassword">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>&amp;Store SMTP password</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QCheckBox" name="kcfg_requiresAuthentication">
+            <property name="text">
+             <string>Server &amp;requires authentication</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+     <widget class="QWidget" name="advancedTab">
+      <attribute name="title">
+       <string comment="advanced smtp settings">Advanced</string>
+      </attribute>
+      <layout class="QVBoxLayout" name="verticalLayout_7">
+       <item>
+        <widget class="QGroupBox" name="encryptionGroup">
+         <property name="enabled">
+          <bool>true</bool>
+         </property>
+         <property name="title">
+          <string>Connection Settings</string>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_5">
+          <item>
+           <widget class="QStackedWidget" name="checkCapabilitiesStack">
+            <property name="currentIndex">
+             <number>0</number>
+            </property>
+            <widget class="QWidget" name="page">
+             <layout class="QVBoxLayout" name="verticalLayout_3">
+              <item>
+               <widget class="QPushButton" name="checkCapabilities">
+                <property name="text">
+                 <string>Auto Detect</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+            <widget class="QWidget" name="page_2">
+             <layout class="QVBoxLayout" name="verticalLayout_4">
+              <item>
+               <widget class="QProgressBar" name="checkCapabilitiesProgress">
+                <property name="value">
+                 <number>0</number>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </widget>
+           </widget>
+          </item>
+          <item>
+           <widget class="QLabel" name="noAuthPossible">
+            <property name="visible">
+             <bool>false</bool>
+            </property>
+            <property name="frameShape">
+             <enum>QFrame::Box</enum>
+            </property>
+            <property name="frameShadow">
+             <enum>QFrame::Plain</enum>
+            </property>
+            <property name="lineWidth">
+             <number>0</number>
+            </property>
+            <property name="text">
+             <string>This server does not support authentication</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item>
+           <layout class="QFormLayout" name="formLayout_2">
+            <property name="fieldGrowthPolicy">
+             <enum>QFormLayout::ExpandingFieldsGrow</enum>
+            </property>
+            <item row="0" column="0">
+             <widget class="QLabel" name="label">
+              <property name="text">
+               <string>Encryption:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <layout class="QHBoxLayout" name="encryptHLayout">
+              <item>
+               <widget class="QRadioButton" name="encryptionNone">
+                <property name="text">
+                 <string>&amp;None</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QRadioButton" name="encryptionSsl">
+                <property name="text">
+                 <string>&amp;SSL</string>
+                </property>
+               </widget>
+              </item>
+              <item>
+               <widget class="QRadioButton" name="encryptionTls">
+                <property name="text">
+                 <string>&amp;TLS</string>
+                </property>
+               </widget>
+              </item>
+             </layout>
+            </item>
+            <item row="1" column="0">
+             <widget class="QLabel" name="portLabel">
+              <property name="text">
+               <string>&amp;Port:</string>
+              </property>
+              <property name="alignment">
+               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+              </property>
+              <property name="buddy">
+               <cstring>kcfg_port</cstring>
+              </property>
+             </widget>
+            </item>
+            <item row="1" column="1">
+             <widget class="QSpinBox" name="kcfg_port">
+              <property name="minimum">
+               <number>1</number>
+              </property>
+              <property name="maximum">
+               <number>65535</number>
+              </property>
+              <property name="value">
+               <number>25</number>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="0">
+             <widget class="QLabel" name="authLabel">
+              <property name="text">
+               <string>Authentication:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="2" column="1">
+             <widget class="QComboBox" name="authCombo"/>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <widget class="QGroupBox" name="groupBox_2">
+         <property name="title">
+          <string>SMTP Settings</string>
+         </property>
+         <layout class="QFormLayout" name="formLayout">
+          <item row="0" column="0" colspan="2">
+           <widget class="QCheckBox" name="kcfg_specifyHostname">
+            <property name="text">
+             <string>Sen&amp;d custom hostname to server</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QLabel" name="hostnameLabel">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Hostna&amp;me:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+            <property name="buddy">
+             <cstring>kcfg_localHostname</cstring>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="KLineEdit" name="kcfg_localHostname">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="trapEnterKeyEvent" stdset="0">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0" colspan="2">
+           <widget class="QCheckBox" name="kcfg_specifySenderOverwriteAddress">
+            <property name="text">
+             <string>Use custom sender address</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="0">
+           <widget class="QLabel" name="label_2">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="text">
+             <string>Sender Address:</string>
+            </property>
+           </widget>
+          </item>
+          <item row="3" column="1">
+           <widget class="KLineEdit" name="kcfg_senderOverwriteAddress">
+            <property name="enabled">
+             <bool>false</bool>
+            </property>
+            <property name="trapEnterKeyEvent" stdset="0">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="0">
+           <widget class="QLabel" name="precommandLabel">
+            <property name="text">
+             <string>Precommand:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="4" column="1">
+           <widget class="KLineEdit" name="kcfg_precommand">
+            <property name="trapEnterKeyEvent" stdset="0">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
+        <spacer name="verticalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>0</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KLineEdit</class>
+   <extends>QLineEdit</extends>
+   <header>klineedit.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>kcfg_host</tabstop>
+  <tabstop>kcfg_requiresAuthentication</tabstop>
+  <tabstop>kcfg_userName</tabstop>
+  <tabstop>password</tabstop>
+  <tabstop>kcfg_storePassword</tabstop>
+  <tabstop>checkCapabilities</tabstop>
+  <tabstop>encryptionNone</tabstop>
+  <tabstop>encryptionSsl</tabstop>
+  <tabstop>encryptionTls</tabstop>
+  <tabstop>authCombo</tabstop>
+  <tabstop>kcfg_specifyHostname</tabstop>
+  <tabstop>kcfg_localHostname</tabstop>
+  <tabstop>kcfg_specifySenderOverwriteAddress</tabstop>
+  <tabstop>kcfg_senderOverwriteAddress</tabstop>
+  <tabstop>kcfg_precommand</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>kcfg_specifyHostname</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>hostnameLabel</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>101</x>
+     <y>249</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>83</x>
+     <y>277</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>kcfg_specifyHostname</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>kcfg_localHostname</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>196</x>
+     <y>249</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>199</x>
+     <y>277</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>kcfg_requiresAuthentication</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>kcfg_userName</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>372</x>
+     <y>110</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>372</x>
+     <y>137</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>kcfg_requiresAuthentication</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>usernameLabel</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>372</x>
+     <y>110</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>141</x>
+     <y>137</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>kcfg_requiresAuthentication</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>passwordLabel</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>372</x>
+     <y>110</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>128</x>
+     <y>164</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>kcfg_requiresAuthentication</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>password</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>372</x>
+     <y>110</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>372</x>
+     <y>164</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>kcfg_requiresAuthentication</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>kcfg_storePassword</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>372</x>
+     <y>110</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>372</x>
+     <y>189</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>kcfg_specifySenderOverwriteAddress</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>label_2</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>59</x>
+     <y>299</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>78</x>
+     <y>312</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>kcfg_specifySenderOverwriteAddress</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>kcfg_senderOverwriteAddress</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>152</x>
+     <y>297</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>169</x>
+     <y>318</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff -Nru kmailtransport-16.12.3/src/kmailtransport/ui/transportmanagementwidget.ui kmailtransport-17.04.3/src/kmailtransport/ui/transportmanagementwidget.ui
--- kmailtransport-16.12.3/src/kmailtransport/ui/transportmanagementwidget.ui	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/ui/transportmanagementwidget.ui	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MailTransport::TransportManagementWidget</class>
+ <widget class="QWidget" name="MailTransport::TransportManagementWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="3" column="1">
+    <widget class="QPushButton" name="removeButton">
+     <property name="text">
+      <string>Remo&amp;ve</string>
+     </property>
+    </widget>
+   </item>
+   <item row="5" column="1">
+    <widget class="QPushButton" name="defaultButton">
+     <property name="text">
+      <string>&amp;Set as Default</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="0" rowspan="7">
+    <widget class="TransportListView" name="transportList">
+     <property name="itemsExpandable">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="6" column="1">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>141</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="1">
+    <widget class="QPushButton" name="addButton">
+     <property name="text">
+      <string>A&amp;dd...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QPushButton" name="renameButton">
+     <property name="text">
+      <string>&amp;Rename</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QPushButton" name="editButton">
+     <property name="text">
+      <string>&amp;Modify...</string>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="KSeparator" name="kseparator"/>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>KSeparator</class>
+   <extends>QFrame</extends>
+   <header>kseparator.h</header>
+  </customwidget>
+  <customwidget>
+   <class>TransportListView</class>
+   <extends>QTreeWidget</extends>
+   <header location="global">widgets/transportlistview.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>transportList</tabstop>
+  <tabstop>addButton</tabstop>
+  <tabstop>editButton</tabstop>
+  <tabstop>renameButton</tabstop>
+  <tabstop>removeButton</tabstop>
+  <tabstop>defaultButton</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>
diff -Nru kmailtransport-16.12.3/src/kmailtransport/widgets/addtransportdialog.cpp kmailtransport-17.04.3/src/kmailtransport/widgets/addtransportdialog.cpp
--- kmailtransport-16.12.3/src/kmailtransport/widgets/addtransportdialog.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/widgets/addtransportdialog.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,184 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "addtransportdialog.h"
+#include "transport.h"
+#include "transportconfigwidget.h"
+#include "transportmanager.h"
+#include "transporttype.h"
+#include "ui_addtransportdialog.h"
+
+#include "mailtransport_debug.h"
+#include <QDialogButtonBox>
+
+#include <QPushButton>
+
+using namespace MailTransport;
+
+/**
+  @internal
+*/
+class AddTransportDialog::Private
+{
+public:
+    Private(AddTransportDialog *qq)
+        : q(qq)
+        , okButton(nullptr)
+    {
+    }
+
+    /**
+      Returns the currently selected type in the type selection widget, or
+      an invalid type if none is selected.
+    */
+    TransportType selectedType() const;
+
+    /**
+      Enables the OK button if a type is selected.
+    */
+    void updateOkButton(); // slot
+    void doubleClicked(); //slot
+    void writeConfig();
+    void readConfig();
+
+    AddTransportDialog *const q;
+    QPushButton *okButton;
+    ::Ui::AddTransportDialog ui;
+};
+
+void AddTransportDialog::Private::writeConfig()
+{
+    KConfigGroup group(KSharedConfig::openConfig(), "AddTransportDialog");
+    group.writeEntry("Size", q->size());
+}
+
+void AddTransportDialog::Private::readConfig()
+{
+    KConfigGroup group(KSharedConfig::openConfig(), "AddTransportDialog");
+    const QSize sizeDialog = group.readEntry("Size", QSize(300, TransportManager::self()->types().size() > 1 ? 200 : 80));
+    if (sizeDialog.isValid()) {
+        q->resize(sizeDialog);
+    }
+}
+
+TransportType AddTransportDialog::Private::selectedType() const
+{
+    QList<QTreeWidgetItem *> sel = ui.typeListView->selectedItems();
+    if (!sel.empty()) {
+        return sel.first()->data(0, Qt::UserRole).value<TransportType>();
+    }
+    return TransportType();
+}
+
+void AddTransportDialog::Private::doubleClicked()
+{
+    if (selectedType().isValid() && !ui.name->text().trimmed().isEmpty()) {
+        q->accept();
+    }
+}
+
+void AddTransportDialog::Private::updateOkButton()
+{
+    // Make sure a type is selected before allowing the user to continue.
+    okButton->setEnabled(selectedType().isValid() && !ui.name->text().trimmed().isEmpty());
+}
+
+AddTransportDialog::AddTransportDialog(QWidget *parent)
+    : QDialog(parent)
+    , d(new Private(this))
+{
+    // Setup UI.
+    {
+        QVBoxLayout *mainLayout = new QVBoxLayout(this);
+        QWidget *widget = new QWidget(this);
+        d->ui.setupUi(widget);
+        mainLayout->addWidget(widget);
+        setWindowTitle(i18n("Create Outgoing Account"));
+        QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+        d->okButton = buttonBox->button(QDialogButtonBox::Ok);
+        d->okButton->setText(i18nc("create and configure a mail transport", "Create and Configure"));
+        d->okButton->setEnabled(false);
+        d->okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
+        mainLayout->addWidget(buttonBox);
+        connect(buttonBox, &QDialogButtonBox::accepted, this, &AddTransportDialog::accept);
+        connect(buttonBox, &QDialogButtonBox::rejected, this, &AddTransportDialog::reject);
+    }
+
+    // Populate type list.
+    const auto transportTypes = TransportManager::self()->types();
+    for (const TransportType &type : transportTypes) {
+        QTreeWidgetItem *treeItem = new QTreeWidgetItem(d->ui.typeListView);
+        treeItem->setText(0, type.name());
+        treeItem->setText(1, type.description());
+        treeItem->setData(0, Qt::UserRole, QVariant::fromValue(type));     // the transport type
+        if (type.type() == TransportBase::EnumType::SMTP) {
+            treeItem->setSelected(true); // select SMTP by default
+        }
+    }
+    d->ui.typeListView->resizeColumnToContents(0);
+
+    // if we only have one type, don't bother the user with this
+    if (d->ui.typeListView->invisibleRootItem()->childCount() == 1) {
+        d->ui.descLabel->hide();
+        d->ui.typeListView->hide();
+    }
+
+    updateGeometry();
+    d->ui.typeListView->setFocus();
+
+    // Connect user input.
+    connect(d->ui.typeListView, SIGNAL(itemClicked(QTreeWidgetItem *,int)),
+            this, SLOT(updateOkButton()));
+    connect(d->ui.typeListView, SIGNAL(itemSelectionChanged()),
+            this, SLOT(updateOkButton()));
+    connect(d->ui.typeListView, SIGNAL(itemDoubleClicked(QTreeWidgetItem *,int)),
+            this, SLOT(doubleClicked()));
+    connect(d->ui.name, SIGNAL(textChanged(QString)),
+            this, SLOT(updateOkButton()));
+    d->readConfig();
+}
+
+AddTransportDialog::~AddTransportDialog()
+{
+    d->writeConfig();
+    delete d;
+}
+
+void AddTransportDialog::accept()
+{
+    if (!d->selectedType().isValid()) {
+        return;
+    }
+
+    // Create a new transport and configure it.
+    Transport *transport = TransportManager::self()->createTransport();
+    transport->setTransportType(d->selectedType());
+    transport->setName(d->ui.name->text().trimmed());
+    transport->forceUniqueName();
+    if (TransportManager::self()->configureTransport(transport, this)) {
+        // The user clicked OK and the transport settings were saved.
+        TransportManager::self()->addTransport(transport);
+        if (d->ui.setDefault->isChecked()) {
+            TransportManager::self()->setDefaultTransport(transport->id());
+        }
+        QDialog::accept();
+    }
+}
+
+#include "moc_addtransportdialog.cpp"
diff -Nru kmailtransport-16.12.3/src/kmailtransport/widgets/addtransportdialog.h kmailtransport-17.04.3/src/kmailtransport/widgets/addtransportdialog.h
--- kmailtransport-16.12.3/src/kmailtransport/widgets/addtransportdialog.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/widgets/addtransportdialog.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,65 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_ADDTRANSPORTDIALOG_H
+#define MAILTRANSPORT_ADDTRANSPORTDIALOG_H
+
+#include <QDialog>
+
+namespace MailTransport {
+/**
+  @internal
+
+  A dialog for creating a new transport.  It asks the user for the transport
+  type and name, and then proceeds to configure the new transport.
+
+  To create a new transport from applications, use
+  TransportManager::showNewTransportDialog().
+
+  @author Constantin Berzan <exit3219@gmail.com>
+  @since 4.4
+*/
+class AddTransportDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    /**
+      Creates a new AddTransportDialog.
+    */
+    explicit AddTransportDialog(QWidget *parent = nullptr);
+
+    /**
+      Destroys the AddTransportDialog.
+    */
+    virtual ~AddTransportDialog();
+
+    /* reimpl */
+    void accept() Q_DECL_OVERRIDE;
+
+private:
+    class Private;
+    Private *const d;
+
+    Q_PRIVATE_SLOT(d, void updateOkButton())
+    Q_PRIVATE_SLOT(d, void doubleClicked())
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_ADDTRANSPORTDIALOG_H
diff -Nru kmailtransport-16.12.3/src/kmailtransport/widgets/smtpconfigwidget.cpp kmailtransport-17.04.3/src/kmailtransport/widgets/smtpconfigwidget.cpp
--- kmailtransport-16.12.3/src/kmailtransport/widgets/smtpconfigwidget.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/widgets/smtpconfigwidget.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,348 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    Based on MailTransport code by:
+    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+    Copyright (c) 2007 KovoKs <kovoks@kovoks.nl>
+
+    Based on KMail code by:
+    Copyright (c) 2001-2002 Michael Haeckel <haeckel@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "smtpconfigwidget.h"
+#include "ui_smtpsettings.h"
+#include "helper_p.h"
+
+#include "transportconfigwidget_p.h"
+#include "transport.h"
+#include "transportmanager.h"
+#include "servertest.h"
+#include "mailtransport_defs.h"
+
+#include <QAbstractButton>
+#include <QButtonGroup>
+
+#include <KProtocolInfo>
+#include "mailtransport_debug.h"
+#include <KMessageBox>
+
+using namespace MailTransport;
+
+class MailTransport::SMTPConfigWidgetPrivate : public TransportConfigWidgetPrivate
+{
+public:
+    ::Ui::SMTPSettings ui;
+
+    ServerTest *serverTest;
+    QButtonGroup *encryptionGroup;
+
+    // detected authentication capabilities
+    QVector<int> noEncCapa, sslCapa, tlsCapa;
+
+    bool serverTestFailed;
+
+    static void addAuthenticationItem(QComboBox *combo, int authenticationType)
+    {
+        combo->addItem(Transport::authenticationTypeString(authenticationType),
+                       QVariant(authenticationType));
+    }
+
+    void resetAuthCapabilities()
+    {
+        noEncCapa.clear();
+        noEncCapa << Transport::EnumAuthenticationType::LOGIN
+                  << Transport::EnumAuthenticationType::PLAIN
+                  << Transport::EnumAuthenticationType::CRAM_MD5
+                  << Transport::EnumAuthenticationType::DIGEST_MD5
+                  << Transport::EnumAuthenticationType::NTLM
+                  << Transport::EnumAuthenticationType::GSSAPI;
+        sslCapa = tlsCapa = noEncCapa;
+        updateAuthCapbilities();
+    }
+
+    void updateAuthCapbilities()
+    {
+        if (serverTestFailed) {
+            return;
+        }
+
+        QVector<int> capa = noEncCapa;
+        if (ui.encryptionSsl->isChecked()) {
+            capa = sslCapa;
+        } else if (ui.encryptionTls->isChecked()) {
+            capa = tlsCapa;
+        }
+
+        ui.authCombo->clear();
+        for (int authType : qAsConst(capa)) {
+            addAuthenticationItem(ui.authCombo, authType);
+        }
+
+        if (transport->isValid()) {
+            const int idx = ui.authCombo->findData(transport->authenticationType());
+
+            if (idx != -1) {
+                ui.authCombo->setCurrentIndex(idx);
+            }
+        }
+
+        if (capa.isEmpty()) {
+            ui.noAuthPossible->setVisible(true);
+            ui.kcfg_requiresAuthentication->setChecked(false);
+            ui.kcfg_requiresAuthentication->setEnabled(false);
+            ui.kcfg_requiresAuthentication->setVisible(false);
+            ui.authCombo->setEnabled(false);
+            ui.authLabel->setEnabled(false);
+        } else {
+            ui.noAuthPossible->setVisible(false);
+            ui.kcfg_requiresAuthentication->setEnabled(true);
+            ui.kcfg_requiresAuthentication->setVisible(true);
+            ui.authCombo->setEnabled(true);
+            ui.authLabel->setEnabled(true);
+        }
+    }
+};
+
+SMTPConfigWidget::SMTPConfigWidget(Transport *transport, QWidget *parent)
+    : TransportConfigWidget(*new SMTPConfigWidgetPrivate, transport, parent)
+{
+    init();
+}
+
+static void checkHighestEnabledButton(QButtonGroup *group)
+{
+    Q_ASSERT(group);
+
+    for (int i = group->buttons().count() - 1; i >= 0; --i) {
+        QAbstractButton *b = group->buttons().at(i);
+        if (b && b->isEnabled()) {
+            b->animateClick();
+            return;
+        }
+    }
+}
+
+void SMTPConfigWidget::init()
+{
+    Q_D(SMTPConfigWidget);
+    d->serverTest = nullptr;
+
+    connect(TransportManager::self(), &TransportManager::passwordsChanged, this, &SMTPConfigWidget::passwordsLoaded);
+
+    d->serverTestFailed = false;
+
+    d->ui.setupUi(this);
+    d->manager->addWidget(this);   // otherwise it doesn't find out about these widgets
+    d->manager->updateWidgets();
+
+    d->encryptionGroup = new QButtonGroup(this);
+    d->encryptionGroup->addButton(d->ui.encryptionNone, Transport::EnumEncryption::None);
+    d->encryptionGroup->addButton(d->ui.encryptionSsl, Transport::EnumEncryption::SSL);
+    d->encryptionGroup->addButton(d->ui.encryptionTls, Transport::EnumEncryption::TLS);
+
+    d->ui.encryptionNone->setChecked(d->transport->encryption() == Transport::EnumEncryption::None);
+    d->ui.encryptionSsl->setChecked(d->transport->encryption() == Transport::EnumEncryption::SSL);
+    d->ui.encryptionTls->setChecked(d->transport->encryption() == Transport::EnumEncryption::TLS);
+
+    d->resetAuthCapabilities();
+
+    if (KProtocolInfo::capabilities(SMTP_PROTOCOL).contains(QStringLiteral("SASL")) == 0) {
+        d->ui.authCombo->removeItem(d->ui.authCombo->findData(
+                                        Transport::EnumAuthenticationType::NTLM));
+        d->ui.authCombo->removeItem(d->ui.authCombo->findData(
+                                        Transport::EnumAuthenticationType::GSSAPI));
+    }
+
+    connect(d->ui.checkCapabilities, &QPushButton::clicked, this, &SMTPConfigWidget::checkSmtpCapabilities);
+    connect(d->ui.kcfg_host, &QLineEdit::textChanged, this, &SMTPConfigWidget::hostNameChanged);
+    connect(d->encryptionGroup, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), this, &SMTPConfigWidget::encryptionChanged);
+    connect(d->ui.kcfg_requiresAuthentication, &QCheckBox::toggled, this, &SMTPConfigWidget::ensureValidAuthSelection);
+
+    if (!d->transport->isValid()) {
+        checkHighestEnabledButton(d->encryptionGroup);
+    }
+
+    // load the password
+    d->transport->updatePasswordState();
+    if (d->transport->isComplete()) {
+        d->ui.password->setText(d->transport->password());
+    } else {
+        if (d->transport->requiresAuthentication()) {
+            TransportManager::self()->loadPasswordsAsync();
+        }
+    }
+
+    hostNameChanged(d->transport->host());
+}
+
+void SMTPConfigWidget::checkSmtpCapabilities()
+{
+    Q_D(SMTPConfigWidget);
+
+    d->serverTest = new ServerTest(this);
+    d->serverTest->setProtocol(SMTP_PROTOCOL);
+    d->serverTest->setServer(d->ui.kcfg_host->text().trimmed());
+    if (d->ui.kcfg_specifyHostname->isChecked()) {
+        d->serverTest->setFakeHostname(d->ui.kcfg_localHostname->text());
+    }
+    QAbstractButton *encryptionChecked = d->encryptionGroup->checkedButton();
+    if (encryptionChecked == d->ui.encryptionNone) {
+        d->serverTest->setPort(Transport::EnumEncryption::None, d->ui.kcfg_port->value());
+    } else if (encryptionChecked == d->ui.encryptionSsl) {
+        d->serverTest->setPort(Transport::EnumEncryption::SSL, d->ui.kcfg_port->value());
+    }
+    d->serverTest->setProgressBar(d->ui.checkCapabilitiesProgress);
+    d->ui.checkCapabilitiesStack->setCurrentIndex(1);
+    qApp->setOverrideCursor(Qt::BusyCursor);
+
+    connect(d->serverTest, &ServerTest::finished, this, &SMTPConfigWidget::slotFinished);
+    connect(d->serverTest, &ServerTest::finished, qApp, [](){
+        qApp->restoreOverrideCursor();
+    });
+    d->ui.checkCapabilities->setEnabled(false);
+    d->serverTest->start();
+    d->serverTestFailed = false;
+}
+
+void SMTPConfigWidget::apply()
+{
+    Q_D(SMTPConfigWidget);
+    Q_ASSERT(d->manager);
+    d->manager->updateSettings();
+    d->transport->setPassword(d->ui.password->text());
+
+    KConfigGroup group(d->transport->config(), d->transport->currentGroup());
+    const int index = d->ui.authCombo->currentIndex();
+    if (index >= 0) {
+        group.writeEntry("authtype", d->ui.authCombo->itemData(index).toInt());
+    }
+
+    if (d->ui.encryptionNone->isChecked()) {
+        d->transport->setEncryption(Transport::EnumEncryption::None);
+    }
+    if (d->ui.encryptionSsl->isChecked()) {
+        d->transport->setEncryption(Transport::EnumEncryption::SSL);
+    }
+    if (d->ui.encryptionTls->isChecked()) {
+        d->transport->setEncryption(Transport::EnumEncryption::TLS);
+    }
+
+    TransportConfigWidget::apply();
+}
+
+void SMTPConfigWidget::passwordsLoaded()
+{
+    Q_D(SMTPConfigWidget);
+
+    // Load the password from the original to our cloned copy
+    d->transport->updatePasswordState();
+
+    if (d->ui.password->text().isEmpty()) {
+        d->ui.password->setText(d->transport->password());
+    }
+}
+
+// TODO rename
+void SMTPConfigWidget::slotFinished(const QVector<int> &results)
+{
+    Q_D(SMTPConfigWidget);
+
+    d->ui.checkCapabilitiesStack->setCurrentIndex(0);
+
+    d->ui.checkCapabilities->setEnabled(true);
+    d->serverTest->deleteLater();
+
+    // If the servertest did not find any useable authentication modes, assume the
+    // connection failed and don't disable any of the radioboxes.
+    if (results.isEmpty()) {
+        KMessageBox::error(this, i18n("Failed to check capabilities. Please verify port and authentication mode."), i18n("Check Capabilities Failed"));
+        d->serverTestFailed = true;
+        d->serverTest->deleteLater();
+        return;
+    }
+
+    // encryption method
+    d->ui.encryptionNone->setEnabled(results.contains(Transport::EnumEncryption::None));
+    d->ui.encryptionSsl->setEnabled(results.contains(Transport::EnumEncryption::SSL));
+    d->ui.encryptionTls->setEnabled(results.contains(Transport::EnumEncryption::TLS));
+    checkHighestEnabledButton(d->encryptionGroup);
+
+    d->noEncCapa = d->serverTest->normalProtocols();
+    if (d->ui.encryptionTls->isEnabled()) {
+        d->tlsCapa = d->serverTest->tlsProtocols();
+    } else {
+        d->tlsCapa.clear();
+    }
+    d->sslCapa = d->serverTest->secureProtocols();
+    d->updateAuthCapbilities();
+    //Show correct port from capabilities.
+    if (d->ui.encryptionSsl->isEnabled()) {
+        const int portValue = d->serverTest->port(Transport::EnumEncryption::SSL);
+        d->ui.kcfg_port->setValue(portValue == -1 ? SMTPS_PORT : portValue);
+    } else if (d->ui.encryptionNone->isEnabled()) {
+        const int portValue = d->serverTest->port(Transport::EnumEncryption::None);
+        d->ui.kcfg_port->setValue(portValue == -1 ? SMTP_PORT : portValue);
+    }
+    d->serverTest->deleteLater();
+}
+
+void SMTPConfigWidget::hostNameChanged(const QString &text)
+{
+    // TODO: really? is this done at every change? wtf
+
+    Q_D(SMTPConfigWidget);
+
+    // sanitize hostname...
+    const int pos = d->ui.kcfg_host->cursorPosition();
+    d->ui.kcfg_host->blockSignals(true);
+    d->ui.kcfg_host->setText(text.trimmed());
+    d->ui.kcfg_host->blockSignals(false);
+    d->ui.kcfg_host->setCursorPosition(pos);
+
+    d->resetAuthCapabilities();
+    for (int i = 0; d->encryptionGroup && i < d->encryptionGroup->buttons().count(); ++i) {
+        d->encryptionGroup->buttons().at(i)->setEnabled(true);
+    }
+}
+
+void SMTPConfigWidget::ensureValidAuthSelection()
+{
+    Q_D(SMTPConfigWidget);
+
+    // adjust available authentication methods
+    d->updateAuthCapbilities();
+}
+
+void SMTPConfigWidget::encryptionChanged(int enc)
+{
+    Q_D(SMTPConfigWidget);
+    qCDebug(MAILTRANSPORT_LOG) << enc;
+
+    // adjust port
+    if (enc == Transport::EnumEncryption::SSL) {
+        if (d->ui.kcfg_port->value() == SMTP_PORT) {
+            d->ui.kcfg_port->setValue(SMTPS_PORT);
+        }
+    } else {
+        if (d->ui.kcfg_port->value() == SMTPS_PORT) {
+            d->ui.kcfg_port->setValue(SMTP_PORT);
+        }
+    }
+
+    ensureValidAuthSelection();
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransport/widgets/smtpconfigwidget.h kmailtransport-17.04.3/src/kmailtransport/widgets/smtpconfigwidget.h
--- kmailtransport-16.12.3/src/kmailtransport/widgets/smtpconfigwidget.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/widgets/smtpconfigwidget.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,70 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    Based on MailTransport code by:
+    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+
+    Based on KMail code by:
+    Copyright (c) 2001-2002 Michael Haeckel <haeckel@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_SMTPCONFIGWIDGET_H
+#define MAILTRANSPORT_SMTPCONFIGWIDGET_H
+
+#include "transportconfigwidget.h"
+
+namespace MailTransport {
+class Transport;
+
+/**
+  @internal
+*/
+class SMTPConfigWidgetPrivate;
+
+/**
+  @internal
+  Configuration widget for a SMTP transport.
+*/
+class SMTPConfigWidget : public TransportConfigWidget
+{
+    Q_OBJECT
+
+public:
+    explicit SMTPConfigWidget(Transport *transport, QWidget *parent = nullptr);
+    //virtual ~SMTPConfigWidget();
+
+public Q_SLOTS:
+    /** reimpl */
+    void apply() Q_DECL_OVERRIDE;
+
+private Q_SLOTS:
+    void checkSmtpCapabilities();
+    void passwordsLoaded();
+    void slotFinished(const QVector<int> &results);
+    void hostNameChanged(const QString &text);
+    void encryptionChanged(int enc);
+    void ensureValidAuthSelection();
+
+private:
+    Q_DECLARE_PRIVATE(SMTPConfigWidget)
+
+    void init();
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_SMTPCONFIGWIDGET_H
diff -Nru kmailtransport-16.12.3/src/kmailtransport/widgets/transportcombobox.cpp kmailtransport-17.04.3/src/kmailtransport/widgets/transportcombobox.cpp
--- kmailtransport-16.12.3/src/kmailtransport/widgets/transportcombobox.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/widgets/transportcombobox.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,95 @@
+/*
+    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "transportcombobox.h"
+#include "transport.h"
+#include "transportmanager.h"
+
+using namespace MailTransport;
+
+/**
+ * Private class that helps to provide binary compatibility between releases.
+ * @internal
+ */
+class TransportComboBoxPrivate
+{
+public:
+    QVector<int> transports;
+};
+
+TransportComboBox::TransportComboBox(QWidget *parent)
+    : QComboBox(parent)
+    , d(new TransportComboBoxPrivate)
+{
+    QMetaObject::invokeMethod(this, "updateComboboxList");
+    connect(TransportManager::self(), &TransportManager::transportsChanged, this, &TransportComboBox::updateComboboxList);
+}
+
+TransportComboBox::~TransportComboBox()
+{
+    delete d;
+}
+
+int TransportComboBox::currentTransportId() const
+{
+    if (currentIndex() >= 0 && currentIndex() < d->transports.count()) {
+        return d->transports.at(currentIndex());
+    }
+    return -1;
+}
+
+void TransportComboBox::setCurrentTransport(int transportId)
+{
+    const int i = d->transports.indexOf(transportId);
+    if (i >= 0 && i < count()) {
+        setCurrentIndex(i);
+    }
+}
+
+TransportBase::EnumType::type TransportComboBox::transportType() const
+{
+    int transtype = TransportManager::self()->transportById(currentTransportId())->type();
+    return static_cast<TransportBase::EnumType::type>(transtype);
+}
+
+void TransportComboBox::updateComboboxList()
+{
+    const int oldTransport = currentTransportId();
+    clear();
+
+    int defaultId = 0;
+    if (!TransportManager::self()->isEmpty()) {
+        const QStringList listNames = TransportManager::self()->transportNames();
+        const QVector<int> listIds = TransportManager::self()->transportIds();
+        addItems(listNames);
+        setTransportList(listIds);
+        defaultId = TransportManager::self()->defaultTransportId();
+    }
+
+    if (oldTransport != -1) {
+        setCurrentTransport(oldTransport);
+    } else {
+        setCurrentTransport(defaultId);
+    }
+}
+
+void TransportComboBox::setTransportList(const QVector<int> &transportList)
+{
+    d->transports = transportList;
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransport/widgets/transportcombobox.h kmailtransport-17.04.3/src/kmailtransport/widgets/transportcombobox.h
--- kmailtransport-16.12.3/src/kmailtransport/widgets/transportcombobox.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/widgets/transportcombobox.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,78 @@
+/*
+  Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_TRANSPORTCOMBOBOX_H
+#define MAILTRANSPORT_TRANSPORTCOMBOBOX_H
+
+#include <mailtransport_export.h>
+#include <transportbase.h>
+
+#include <QComboBox>
+
+class TransportComboBoxPrivate;
+
+namespace MailTransport {
+/**
+  A combo-box for selecting a mail transport.
+  It is updated automatically when transports are added, changed, or removed.
+*/
+class MAILTRANSPORT_EXPORT TransportComboBox : public QComboBox
+{
+    Q_OBJECT
+
+public:
+    /**
+      Creates a new mail transport selection combo box.
+      @param parent The paren widget.
+    */
+    TransportComboBox(QWidget *parent = nullptr);
+
+    ~TransportComboBox();
+
+    /**
+      Returns identifier of the currently selected mail transport.
+    */
+    int currentTransportId() const;
+
+    /**
+      Selects the given transport.
+      @param transportId The transport identifier.
+    */
+    void setCurrentTransport(int transportId);
+
+    /**
+      Returns the type of the selected transport.
+    */
+    TransportBase::EnumType::type transportType() const;
+
+protected:
+    void setTransportList(const QVector<int> &transportList);
+
+public Q_SLOTS:
+    /**
+     * @since 4.11
+     */
+    void updateComboboxList();
+
+private:
+    TransportComboBoxPrivate *const d;
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_TRANSPORTCOMBOBOX_H
diff -Nru kmailtransport-16.12.3/src/kmailtransport/widgets/transportconfigdialog.cpp kmailtransport-17.04.3/src/kmailtransport/widgets/transportconfigdialog.cpp
--- kmailtransport-16.12.3/src/kmailtransport/widgets/transportconfigdialog.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/widgets/transportconfigdialog.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,124 @@
+/*
+  Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+  Copyright (c) 2007 KovoKs <kovoks@kovoks.nl>
+  Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+  Based on KMail code by:
+  Copyright (c) 2001-2002 Michael Haeckel <haeckel@kde.org>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#include "transportconfigdialog.h"
+#include "transport.h"
+#include "transportconfigwidget.h"
+#include "transportmanager.h"
+#include "transporttype.h"
+#include "smtpconfigwidget.h"
+
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QString>
+#include <QVBoxLayout>
+#include <QPushButton>
+
+#include "mailtransport_debug.h"
+#include <KLocalizedString>
+
+using namespace MailTransport;
+
+class MailTransport::TransportConfigDialog::Private
+{
+public:
+    Private(TransportConfigDialog *qq)
+        : transport(nullptr)
+        , configWidget(nullptr)
+        , q(qq)
+        , okButton(nullptr)
+    {
+    }
+
+    Transport *transport;
+    QWidget *configWidget;
+    TransportConfigDialog *q;
+    QPushButton *okButton;
+
+    // slots
+    void okClicked();
+    void slotTextChanged(const QString &text);
+    void slotEnabledOkButton(bool);
+};
+
+void TransportConfigDialog::Private::slotEnabledOkButton(bool b)
+{
+    okButton->setEnabled(b);
+}
+
+void TransportConfigDialog::Private::okClicked()
+{
+    if (TransportConfigWidget *w = dynamic_cast<TransportConfigWidget *>(configWidget)) {
+        // It is not an Akonadi transport.
+        w->apply();
+        transport->save();
+    }
+}
+
+void TransportConfigDialog::Private::slotTextChanged(const QString &text)
+{
+    okButton->setEnabled(!text.isEmpty());
+}
+
+TransportConfigDialog::TransportConfigDialog(Transport *transport, QWidget *parent)
+    : QDialog(parent)
+    , d(new Private(this))
+{
+    Q_ASSERT(transport);
+    d->transport = transport;
+    QVBoxLayout *mainLayout = new QVBoxLayout(this);
+    bool pathIsEmpty = false;
+    switch (transport->type()) {
+    case Transport::EnumType::SMTP:
+        d->configWidget = new SMTPConfigWidget(transport, this);
+        break;
+    case Transport::EnumType::Akonadi:
+        qCWarning(MAILTRANSPORT_LOG) << "Tried to configure an Akonadi transport.";
+        d->configWidget = new QLabel(i18n("This outgoing account cannot be configured."), this);
+        break;
+    default:
+        Q_ASSERT(false);
+        d->configWidget = nullptr;
+        break;
+    }
+    mainLayout->addWidget(d->configWidget);
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
+    d->okButton = buttonBox->button(QDialogButtonBox::Ok);
+    d->okButton->setEnabled(false);
+    d->okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
+    mainLayout->addWidget(buttonBox);
+
+    connect(d->okButton, SIGNAL(clicked()), this, SLOT(okClicked()));
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &TransportConfigDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &TransportConfigDialog::reject);
+
+    d->okButton->setEnabled(!pathIsEmpty);
+}
+
+TransportConfigDialog::~TransportConfigDialog()
+{
+    delete d;
+}
+
+#include "moc_transportconfigdialog.cpp"
diff -Nru kmailtransport-16.12.3/src/kmailtransport/widgets/transportconfigdialog.h kmailtransport-17.04.3/src/kmailtransport/widgets/transportconfigdialog.h
--- kmailtransport-16.12.3/src/kmailtransport/widgets/transportconfigdialog.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/widgets/transportconfigdialog.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,75 @@
+/*
+    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    Based on KMail code by:
+    Copyright (c) 2001-2002 Michael Haeckel <haeckel@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_TRANSPORTCONFIGDIALOG_H
+#define MAILTRANSPORT_TRANSPORTCONFIGDIALOG_H
+
+#include <mailtransport_export.h>
+
+#include <QDialog>
+
+namespace MailTransport {
+class Transport;
+
+/**
+ * @short Configuration dialog for a mail transport.
+ */
+class TransportConfigDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    /**
+     * Creates a new mail transport configuration dialog for the given
+     * Transport object.
+     * The config dialog does not delete @p transport, you have to delete it
+     * yourself.
+     *
+     * Note that this class only works for transports that are handled directly
+     * by MailTransport, i.e. SMTP.
+     *
+     * @param transport The Transport object to configure. This must be a deep
+     * copy of a Transport object or a newly created one, which hasn't been
+     * added to the TransportManager yet.
+     * @param parent The parent widget.
+     */
+    explicit TransportConfigDialog(Transport *transport, QWidget *parent = nullptr);
+
+    /**
+     * Destroys the transport config dialog.
+     */
+    virtual ~TransportConfigDialog();
+
+private:
+    //@cond PRIVATE
+    class Private;
+    Private *const d;
+
+    Q_PRIVATE_SLOT(d, void okClicked())
+    Q_PRIVATE_SLOT(d, void slotTextChanged(const QString &))
+    Q_PRIVATE_SLOT(d, void slotEnabledOkButton(bool))
+    //@endcond
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_TRANSPORTCONFIGDIALOG_H
diff -Nru kmailtransport-16.12.3/src/kmailtransport/widgets/transportconfigwidget.cpp kmailtransport-17.04.3/src/kmailtransport/widgets/transportconfigwidget.cpp
--- kmailtransport-16.12.3/src/kmailtransport/widgets/transportconfigwidget.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/widgets/transportconfigwidget.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,80 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    Based on MailTransport code by:
+    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+    Copyright (c) 2007 KovoKs <kovoks@kovoks.nl>
+
+    Based on KMail code by:
+    Copyright (c) 2001-2002 Michael Haeckel <haeckel@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "transportconfigwidget.h"
+#include "transportconfigwidget_p.h"
+#include "transport.h"
+#include "transportmanager.h"
+
+#include <KConfigDialogManager>
+#include "mailtransport_debug.h"
+
+using namespace MailTransport;
+
+TransportConfigWidget::TransportConfigWidget(Transport *transport, QWidget *parent)
+    : QWidget(parent)
+    , d_ptr(new TransportConfigWidgetPrivate)
+{
+    init(transport);
+}
+
+TransportConfigWidget::TransportConfigWidget(TransportConfigWidgetPrivate &dd, Transport *transport, QWidget *parent)
+    : QWidget(parent)
+    , d_ptr(&dd)
+{
+    init(transport);
+}
+
+TransportConfigWidget::~TransportConfigWidget()
+{
+    delete d_ptr;
+}
+
+void TransportConfigWidget::init(Transport *transport)
+{
+    Q_D(TransportConfigWidget);
+    qCDebug(MAILTRANSPORT_LOG) << "this" << this << "d" << d;
+    Q_ASSERT(transport);
+    d->transport = transport;
+
+    d->manager = new KConfigDialogManager(this, transport);
+}
+
+KConfigDialogManager *TransportConfigWidget::configManager() const
+{
+    Q_D(const TransportConfigWidget);
+    Q_ASSERT(d->manager);
+    return d->manager;
+}
+
+void TransportConfigWidget::apply()
+{
+    Q_D(TransportConfigWidget);
+    d->manager->updateSettings();
+    d->transport->forceUniqueName();
+    d->transport->save();
+    qCDebug(MAILTRANSPORT_LOG) << "Config written.";
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransport/widgets/transportconfigwidget.h kmailtransport-17.04.3/src/kmailtransport/widgets/transportconfigwidget.h
--- kmailtransport-16.12.3/src/kmailtransport/widgets/transportconfigwidget.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/widgets/transportconfigwidget.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,101 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    Based on MailTransport code by:
+    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+
+    Based on KMail code by:
+    Copyright (c) 2001-2002 Michael Haeckel <haeckel@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_TRANSPORTCONFIGWIDGET_H
+#define MAILTRANSPORT_TRANSPORTCONFIGWIDGET_H
+
+#include <QWidget>
+
+class KConfigDialogManager;
+
+namespace MailTransport {
+class Transport;
+class TransportConfigWidgetPrivate;
+
+/**
+  @internal
+
+  Abstract configuration widget for a mail transport.  It makes sure that
+  the configured transport has a unique name, and takes care of writing its
+  settings to the config file.  If it is a new transport, the caller must
+  still call TransportManager::addTransport() to register the transport.
+
+  Concrete configuration is done in subclasses SMTPConfigWidget.
+
+  To configure a transport from applications, use
+  TransportManager::configureTransport().  You still need to call
+  TransportManager::addTransport() if this is a new transport, not registered
+  with TransportManager.
+
+  @author Constantin Berzan <exit3219@gmail.com>
+  @since 4.4
+*/
+class TransportConfigWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    /**
+      Creates a new mail transport configuration widget for the given
+      Transport object.
+      @param transport The Transport object to configure.
+      @param parent The parent widget.
+    */
+    explicit TransportConfigWidget(Transport *transport, QWidget *parent = nullptr);
+
+    /**
+      Destroys the widget.
+    */
+    virtual ~TransportConfigWidget();
+
+    /**
+      @internal
+      Get the KConfigDialogManager for this widget.
+    */
+    KConfigDialogManager *configManager() const;
+
+public Q_SLOTS:
+    /**
+      Saves the transport's settings.
+
+      The base implementation writes the settings to the config file and makes
+      sure the transport has a unique name.  Reimplement in derived classes to
+      save your custom settings, and call the base implementation.
+    */
+    // TODO: do we also want to check for invalid settings?
+    virtual void apply();
+
+protected:
+    TransportConfigWidgetPrivate *const d_ptr;
+    TransportConfigWidget(TransportConfigWidgetPrivate &dd, Transport *transport, QWidget *parent);
+
+private:
+    Q_DECLARE_PRIVATE(TransportConfigWidget)
+
+    void init(Transport *transport);
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_TRANSPORTCONFIGWIDGET_H
diff -Nru kmailtransport-16.12.3/src/kmailtransport/widgets/transportconfigwidget_p.h kmailtransport-17.04.3/src/kmailtransport/widgets/transportconfigwidget_p.h
--- kmailtransport-16.12.3/src/kmailtransport/widgets/transportconfigwidget_p.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/widgets/transportconfigwidget_p.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_TRANSPORTCONFIGWIDGET_P_H
+#define MAILTRANSPORT_TRANSPORTCONFIGWIDGET_P_H
+
+#include "transport.h"
+
+#include <KConfigDialogManager>
+
+namespace MailTransport {
+/**
+  @internal
+*/
+class TransportConfigWidgetPrivate
+{
+public:
+    Transport *transport;
+    KConfigDialogManager *manager;
+
+    virtual ~TransportConfigWidgetPrivate()
+    {
+    }
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_TRANSPORTCONFIGWIDGET_P_H
diff -Nru kmailtransport-16.12.3/src/kmailtransport/widgets/transportlistview.cpp kmailtransport-17.04.3/src/kmailtransport/widgets/transportlistview.cpp
--- kmailtransport-16.12.3/src/kmailtransport/widgets/transportlistview.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/widgets/transportlistview.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,124 @@
+/*
+  Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+  Based on KMail code by:
+  Copyright (c) 2002 Marc Mutz <mutz@kde.org>
+  Copyright (c) 2007 Mathias Soeken <msoeken@tzi.de>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#include "transportlistview.h"
+#include "transport.h"
+#include "transportmanager.h"
+#include "transporttype.h"
+
+#include <QHeaderView>
+#include <QLineEdit>
+
+#include "mailtransport_debug.h"
+#include <KLocalizedString>
+
+using namespace MailTransport;
+
+TransportListView::TransportListView(QWidget *parent)
+    : QTreeWidget(parent)
+{
+    setHeaderLabels(QStringList()
+                    << i18nc("@title:column email transport name", "Name")
+                    << i18nc("@title:column email transport type", "Type"));
+    setRootIsDecorated(false);
+    header()->setSectionsMovable(false);
+    header()->setSectionResizeMode(QHeaderView::ResizeToContents);
+    setAllColumnsShowFocus(true);
+    setAlternatingRowColors(true);
+    setSortingEnabled(true);
+    sortByColumn(0, Qt::AscendingOrder);
+    setSelectionMode(SingleSelection);
+
+    fillTransportList();
+    connect(TransportManager::self(), &TransportManager::transportsChanged, this, &TransportListView::fillTransportList);
+}
+
+void TransportListView::editItem(QTreeWidgetItem *item, int column)
+{
+    // TODO: is there a nicer way to make only the 'name' column editable?
+    if (column == 0 && item) {
+        Qt::ItemFlags oldFlags = item->flags();
+        item->setFlags(oldFlags | Qt::ItemIsEditable);
+        QTreeWidget::editItem(item, 0);
+        item->setFlags(oldFlags);
+        const int id = item->data(0, Qt::UserRole).toInt();
+        Transport *t = TransportManager::self()->transportById(id);
+        if (!t) {
+            qCWarning(MAILTRANSPORT_LOG) << "Transport" << id << "not known by manager.";
+            return;
+        }
+        if (TransportManager::self()->defaultTransportId() == t->id()) {
+            item->setText(0, t->name());
+        }
+    }
+}
+
+void TransportListView::commitData(QWidget *editor)
+{
+    if (selectedItems().isEmpty()) {
+        // transport was deleted by someone else???
+        qCDebug(MAILTRANSPORT_LOG) << "No selected item.";
+        return;
+    }
+    QTreeWidgetItem *item = selectedItems().first();
+    QLineEdit *edit = dynamic_cast<QLineEdit *>(editor);  // krazy:exclude=qclasses
+    Q_ASSERT(edit);   // original code had if
+
+    const int id = item->data(0, Qt::UserRole).toInt();
+    Transport *t = TransportManager::self()->transportById(id);
+    if (!t) {
+        qCWarning(MAILTRANSPORT_LOG) << "Transport" << id << "not known by manager.";
+        return;
+    }
+    qCDebug(MAILTRANSPORT_LOG) << "Renaming transport" << id << "to" << edit->text();
+    t->setName(edit->text());
+    t->forceUniqueName();
+    t->save();
+}
+
+void TransportListView::fillTransportList()
+{
+    // try to preserve the selection
+    int selected = -1;
+    if (currentItem()) {
+        selected = currentItem()->data(0, Qt::UserRole).toInt();
+    }
+
+    clear();
+    foreach (Transport *t, TransportManager::self()->transports()) {
+        QTreeWidgetItem *item = new QTreeWidgetItem(this);
+        item->setData(0, Qt::UserRole, t->id());
+        QString name = t->name();
+        if (TransportManager::self()->defaultTransportId() == t->id()) {
+            name += i18nc("@label the default mail transport", " (Default)");
+            QFont font(item->font(0));
+            font.setBold(true);
+            item->setFont(0, font);
+        }
+        item->setText(0, name);
+        item->setText(1, t->transportType().name());
+        if (t->id() == selected) {
+            setCurrentItem(item);
+        }
+    }
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransport/widgets/transportlistview.h kmailtransport-17.04.3/src/kmailtransport/widgets/transportlistview.h
--- kmailtransport-16.12.3/src/kmailtransport/widgets/transportlistview.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/widgets/transportlistview.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,49 @@
+/*
+  Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_TRANSPORTLISTVIEW_H
+#define MAILTRANSPORT_TRANSPORTLISTVIEW_H
+
+#include <QTreeWidget>
+
+namespace MailTransport {
+/**
+  @internal
+  A QTreeWidget for transports.
+*/
+class TransportListView : public QTreeWidget
+{
+    Q_OBJECT
+
+public:
+    explicit TransportListView(QWidget *parent = nullptr);
+    //virtual ~TransportListView() {}
+
+    // overloaded from QTreeWidget
+    void editItem(QTreeWidgetItem *item, int column = 0);
+
+protected Q_SLOTS:
+    void commitData(QWidget *editor) Q_DECL_OVERRIDE;
+
+private Q_SLOTS:
+    void fillTransportList();
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_TRANSPORTLISTVIEW_H
diff -Nru kmailtransport-16.12.3/src/kmailtransport/widgets/transportmanagementwidget.cpp kmailtransport-17.04.3/src/kmailtransport/widgets/transportmanagementwidget.cpp
--- kmailtransport-16.12.3/src/kmailtransport/widgets/transportmanagementwidget.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/widgets/transportmanagementwidget.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,176 @@
+/*
+  Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+
+  Based on KMail code by:
+  Copyright (C) 2001-2003 Marc Mutz <mutz@kde.org>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#include "transportmanagementwidget.h"
+#include "ui_transportmanagementwidget.h"
+#include "transportmanager.h"
+#include "transport.h"
+
+#include <KMessageBox>
+#include <QMenu>
+
+using namespace MailTransport;
+
+class Q_DECL_HIDDEN TransportManagementWidget::Private
+{
+public:
+
+    Private(TransportManagementWidget *parent);
+
+    Ui::TransportManagementWidget ui;
+    TransportManagementWidget *q;
+
+    // Slots
+    void defaultClicked();
+    void removeClicked();
+    void renameClicked();
+    void editClicked();
+    void addClicked();
+    void updateButtonState();
+    void slotCustomContextMenuRequested(const QPoint &);
+};
+
+TransportManagementWidget::Private::Private(TransportManagementWidget *parent)
+    : q(parent)
+{
+}
+
+TransportManagementWidget::TransportManagementWidget(QWidget *parent)
+    : QWidget(parent)
+    , d(new Private(this))
+{
+    d->ui.setupUi(this);
+    d->updateButtonState();
+
+    d->ui.transportList->setContextMenuPolicy(Qt::CustomContextMenu);
+    connect(d->ui.transportList, SIGNAL(currentItemChanged(QTreeWidgetItem *,QTreeWidgetItem *)),
+            SLOT(updateButtonState()));
+    connect(d->ui.transportList, SIGNAL(itemDoubleClicked(QTreeWidgetItem *,int)),
+            SLOT(editClicked()));
+    connect(d->ui.addButton, SIGNAL(clicked()), SLOT(addClicked()));
+    connect(d->ui.editButton, SIGNAL(clicked()), SLOT(editClicked()));
+    connect(d->ui.renameButton, SIGNAL(clicked()), SLOT(renameClicked()));
+    connect(d->ui.removeButton, SIGNAL(clicked()), SLOT(removeClicked()));
+    connect(d->ui.defaultButton, SIGNAL(clicked()), SLOT(defaultClicked()));
+    connect(d->ui.transportList, SIGNAL(customContextMenuRequested(QPoint)),
+            SLOT(slotCustomContextMenuRequested(QPoint)));
+}
+
+TransportManagementWidget::~TransportManagementWidget()
+{
+    delete d;
+}
+
+void TransportManagementWidget::Private::updateButtonState()
+{
+    // TODO figure out current item vs. selected item (in almost every function)
+    if (!ui.transportList->currentItem()) {
+        ui.editButton->setEnabled(false);
+        ui.renameButton->setEnabled(false);
+        ui.removeButton->setEnabled(false);
+        ui.defaultButton->setEnabled(false);
+    } else {
+        ui.editButton->setEnabled(true);
+        ui.renameButton->setEnabled(true);
+        ui.removeButton->setEnabled(true);
+        if (ui.transportList->currentItem()->data(0, Qt::UserRole)
+            == TransportManager::self()->defaultTransportId()) {
+            ui.defaultButton->setEnabled(false);
+        } else {
+            ui.defaultButton->setEnabled(true);
+        }
+    }
+}
+
+void TransportManagementWidget::Private::addClicked()
+{
+    TransportManager::self()->showTransportCreationDialog(q);
+}
+
+void TransportManagementWidget::Private::editClicked()
+{
+    if (!ui.transportList->currentItem()) {
+        return;
+    }
+
+    const int currentId = ui.transportList->currentItem()->data(0, Qt::UserRole).toInt();
+    Transport *transport = TransportManager::self()->transportById(currentId);
+    TransportManager::self()->configureTransport(transport, q);
+}
+
+void TransportManagementWidget::Private::renameClicked()
+{
+    if (!ui.transportList->currentItem()) {
+        return;
+    }
+
+    ui.transportList->editItem(ui.transportList->currentItem(), 0);
+}
+
+void TransportManagementWidget::Private::removeClicked()
+{
+    if (!ui.transportList->currentItem()) {
+        return;
+    }
+    const int rc
+        = KMessageBox::questionYesNo(
+        q,
+        i18n("Do you want to remove outgoing account '%1'?",
+             ui.transportList->currentItem()->text(0)),
+        i18n("Remove outgoing account?"));
+    if (rc == KMessageBox::No) {
+        return;
+    }
+
+    TransportManager::self()->removeTransport(
+        ui.transportList->currentItem()->data(0, Qt::UserRole).toInt());
+}
+
+void TransportManagementWidget::Private::defaultClicked()
+{
+    if (!ui.transportList->currentItem()) {
+        return;
+    }
+
+    TransportManager::self()->setDefaultTransport(
+        ui.transportList->currentItem()->data(0, Qt::UserRole).toInt());
+}
+
+void TransportManagementWidget::Private::slotCustomContextMenuRequested(const QPoint &pos)
+{
+    QMenu *menu = new QMenu(q);
+    menu->addAction(i18n("Add..."), q, SLOT(addClicked()));
+    QTreeWidgetItem *item = ui.transportList->itemAt(pos);
+    if (item) {
+        menu->addAction(i18n("Modify..."), q, SLOT(editClicked()));
+        menu->addAction(i18n("Rename"), q, SLOT(renameClicked()));
+        menu->addAction(i18n("Remove"), q, SLOT(removeClicked()));
+        if (item->data(0, Qt::UserRole) != TransportManager::self()->defaultTransportId()) {
+            menu->addSeparator();
+            menu->addAction(i18n("Set as Default"), q, SLOT(defaultClicked()));
+        }
+    }
+    menu->exec(ui.transportList->viewport()->mapToGlobal(pos));
+    delete menu;
+}
+
+#include "moc_transportmanagementwidget.cpp"
diff -Nru kmailtransport-16.12.3/src/kmailtransport/widgets/transportmanagementwidget.h kmailtransport-17.04.3/src/kmailtransport/widgets/transportmanagementwidget.h
--- kmailtransport-16.12.3/src/kmailtransport/widgets/transportmanagementwidget.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransport/widgets/transportmanagementwidget.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,63 @@
+/*
+  Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+
+  Based on KMail code by:
+  Copyright (C) 2001-2003 Marc Mutz <mutz@kde.org>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_TRANSPORTMANAGEMENTWIDGET_H
+#define MAILTRANSPORT_TRANSPORTMANAGEMENTWIDGET_H
+
+#include <mailtransport_export.h>
+
+#include <QWidget>
+
+namespace MailTransport {
+/**
+  A widget to manage mail transports.
+*/
+class MAILTRANSPORT_EXPORT TransportManagementWidget : public QWidget
+{
+    Q_OBJECT
+
+public:
+    /**
+      Creates a new TransportManagementWidget.
+      @param parent The parent widget.
+    */
+    TransportManagementWidget(QWidget *parent = nullptr);
+
+    /**
+      Destroys the widget.
+    */
+    virtual ~TransportManagementWidget();
+
+private:
+    class Private;
+    Private *const d;
+    Q_PRIVATE_SLOT(d, void defaultClicked())
+    Q_PRIVATE_SLOT(d, void removeClicked())
+    Q_PRIVATE_SLOT(d, void renameClicked())
+    Q_PRIVATE_SLOT(d, void editClicked())
+    Q_PRIVATE_SLOT(d, void addClicked())
+    Q_PRIVATE_SLOT(d, void updateButtonState())
+    Q_PRIVATE_SLOT(d, void slotCustomContextMenuRequested(const QPoint &))
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_TRANSPORTMANAGEMENTWIDGET_H
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/attributeregistrar.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/attributeregistrar.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/attributeregistrar.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/attributeregistrar.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+  Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#include "dispatchmodeattribute.h"
+#include "errorattribute.h"
+#include "sentactionattribute.h"
+#include "sentbehaviourattribute.h"
+#include "transportattribute.h"
+
+#include <attributefactory.h>
+
+namespace {
+// Anonymous namespace; function is invisible outside this file.
+bool dummy()
+{
+    using namespace Akonadi;
+    using namespace MailTransport;
+    AttributeFactory::registerAttribute<DispatchModeAttribute>();
+    AttributeFactory::registerAttribute<ErrorAttribute>();
+    AttributeFactory::registerAttribute<SentActionAttribute>();
+    AttributeFactory::registerAttribute<SentBehaviourAttribute>();
+    AttributeFactory::registerAttribute<TransportAttribute>();
+    return true;
+}
+
+// Called when this library is loaded.
+const bool registered = dummy();
+} // namespace
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/attributetest.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/attributetest.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/attributetest.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/attributetest.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,251 @@
+/*
+    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "attributetest.h"
+
+#include <attributefactory.h>
+#include <qtest_akonadi.h>
+#include <addressattribute.h>
+
+#include <kmailtransportakonadi/dispatchmodeattribute.h>
+#include <kmailtransportakonadi/errorattribute.h>
+#include <kmailtransportakonadi/sentactionattribute.h>
+#include <kmailtransportakonadi/sentbehaviourattribute.h>
+#include <kmailtransportakonadi/transportattribute.h>
+
+using namespace Akonadi;
+using namespace MailTransport;
+
+void AttributeTest::initTestCase()
+{
+}
+
+void AttributeTest::testRegistrar()
+{
+    // The attributes should have been registered without any effort on our part.
+    {
+        Attribute *a = AttributeFactory::createAttribute("AddressAttribute");
+        QVERIFY(dynamic_cast<AddressAttribute *>(a));
+        delete a;
+    }
+
+    {
+        Attribute *a = AttributeFactory::createAttribute("DispatchModeAttribute");
+        QVERIFY(dynamic_cast<DispatchModeAttribute *>(a));
+        delete a;
+    }
+
+    {
+        Attribute *a = AttributeFactory::createAttribute("ErrorAttribute");
+        QVERIFY(dynamic_cast<ErrorAttribute *>(a));
+        delete a;
+    }
+
+    {
+        Attribute *a = AttributeFactory::createAttribute("SentActionAttribute");
+        QVERIFY(dynamic_cast<SentActionAttribute *>(a));
+        delete a;
+    }
+
+    {
+        Attribute *a = AttributeFactory::createAttribute("SentBehaviourAttribute");
+        QVERIFY(dynamic_cast<SentBehaviourAttribute *>(a));
+        delete a;
+    }
+
+    {
+        Attribute *a = AttributeFactory::createAttribute("TransportAttribute");
+        QVERIFY(dynamic_cast<TransportAttribute *>(a));
+        delete a;
+    }
+}
+
+void AttributeTest::testSerialization()
+{
+    {
+        QString from(QStringLiteral("from@me.org"));
+        QStringList to(QStringLiteral("to1@me.org"));
+        to << QStringLiteral("to2@me.org");
+        QStringList cc(QStringLiteral("cc1@me.org"));
+        cc << QStringLiteral("cc2@me.org");
+        QStringList bcc(QStringLiteral("bcc1@me.org"));
+        bcc << QStringLiteral("bcc2@me.org");
+        AddressAttribute *a = new AddressAttribute(from, to, cc, bcc);
+        QByteArray data = a->serialized();
+        delete a;
+        a = new AddressAttribute;
+        a->deserialize(data);
+        QCOMPARE(from, a->from());
+        QCOMPARE(to, a->to());
+        QCOMPARE(cc, a->cc());
+        QCOMPARE(bcc, a->bcc());
+        delete a;
+    }
+
+    {
+        DispatchModeAttribute::DispatchMode mode = DispatchModeAttribute::Automatic;
+        QDateTime date = QDateTime::currentDateTime();
+        // The serializer does not keep track of milliseconds, so forget them.
+        qDebug() << "ms" << date.toString(QStringLiteral("z"));
+        int ms = date.toString(QStringLiteral("z")).toInt();
+        date = date.addMSecs(-ms);
+        DispatchModeAttribute *a = new DispatchModeAttribute(mode);
+        a->setSendAfter(date);
+        QByteArray data = a->serialized();
+        delete a;
+        a = new DispatchModeAttribute;
+        a->deserialize(data);
+        QCOMPARE(mode, a->dispatchMode());
+        QCOMPARE(date, a->sendAfter());
+        delete a;
+    }
+
+    {
+        QString msg(QStringLiteral("The #!@$ing thing failed!"));
+        ErrorAttribute *a = new ErrorAttribute(msg);
+        QByteArray data = a->serialized();
+        delete a;
+        a = new ErrorAttribute;
+        a->deserialize(data);
+        QCOMPARE(msg, a->message());
+        delete a;
+    }
+
+    {
+        SentActionAttribute *a = new SentActionAttribute();
+        const qlonglong id = 123456789012345ll;
+
+        a->addAction(SentActionAttribute::Action::MarkAsReplied, QVariant(id));
+        a->addAction(SentActionAttribute::Action::MarkAsForwarded, QVariant(id));
+
+        QByteArray data = a->serialized();
+        delete a;
+        a = new SentActionAttribute;
+        a->deserialize(data);
+
+        const SentActionAttribute::Action::List actions = a->actions();
+        QCOMPARE(actions.count(), 2);
+
+        QCOMPARE(SentActionAttribute::Action::MarkAsReplied, actions[0].type());
+        QCOMPARE(id, actions[0].value().toLongLong());
+
+        QCOMPARE(SentActionAttribute::Action::MarkAsForwarded, actions[1].type());
+        QCOMPARE(id, actions[1].value().toLongLong());
+        delete a;
+    }
+
+    {
+        SentBehaviourAttribute::SentBehaviour beh = SentBehaviourAttribute::MoveToCollection;
+        Collection::Id id = 123456789012345ll;
+        SentBehaviourAttribute *a = new SentBehaviourAttribute(beh, Collection(id));
+        bool sendSilently = true;
+        a->setSendSilently(sendSilently);
+        QByteArray data = a->serialized();
+        delete a;
+        a = new SentBehaviourAttribute;
+        a->deserialize(data);
+        QCOMPARE(beh, a->sentBehaviour());
+        QCOMPARE(id, a->moveToCollection().id());
+        QCOMPARE(sendSilently, a->sendSilently());
+        delete a;
+    }
+
+    //MoveToCollection + silently
+    {
+        SentBehaviourAttribute::SentBehaviour beh = SentBehaviourAttribute::MoveToCollection;
+        Collection::Id id = 123456789012345ll;
+        SentBehaviourAttribute *a = new SentBehaviourAttribute(beh, Collection(id));
+        bool sendSilently = true;
+        a->setSendSilently(sendSilently);
+        QByteArray data = a->serialized();
+        delete a;
+        a = new SentBehaviourAttribute;
+        a->deserialize(data);
+        QCOMPARE(beh, a->sentBehaviour());
+        QCOMPARE(id, a->moveToCollection().id());
+        QCOMPARE(sendSilently, a->sendSilently());
+        SentBehaviourAttribute *copy = a->clone();
+        QCOMPARE(copy->sentBehaviour(), beh);
+        QCOMPARE(copy->moveToCollection().id(), id);
+        QCOMPARE(copy->sendSilently(), sendSilently);
+        delete a;
+        delete copy;
+    }
+
+    //Delete + silently
+    {
+        SentBehaviourAttribute::SentBehaviour beh = SentBehaviourAttribute::Delete;
+        Collection::Id id = 123456789012345ll;
+        SentBehaviourAttribute *a = new SentBehaviourAttribute(beh, Collection(id));
+        bool sendSilently = true;
+        a->setSendSilently(sendSilently);
+        QByteArray data = a->serialized();
+        delete a;
+        a = new SentBehaviourAttribute;
+        a->deserialize(data);
+        QCOMPARE(beh, a->sentBehaviour());
+        //When delete we move to -1
+        QCOMPARE(a->moveToCollection().id(), -1);
+        QCOMPARE(sendSilently, a->sendSilently());
+        SentBehaviourAttribute *copy = a->clone();
+        QCOMPARE(copy->sentBehaviour(), beh);
+        //When delete we move to -1
+        QCOMPARE(copy->moveToCollection().id(), -1);
+        QCOMPARE(copy->sendSilently(), sendSilently);
+        delete a;
+        delete copy;
+    }
+
+    //MoveToDefaultSentCollection + silently
+    {
+        SentBehaviourAttribute::SentBehaviour beh = SentBehaviourAttribute::MoveToDefaultSentCollection;
+        Collection::Id id = 123456789012345ll;
+        SentBehaviourAttribute *a = new SentBehaviourAttribute(beh, Collection(id));
+        bool sendSilently = true;
+        a->setSendSilently(sendSilently);
+        QByteArray data = a->serialized();
+        delete a;
+        a = new SentBehaviourAttribute;
+        a->deserialize(data);
+        QCOMPARE(beh, a->sentBehaviour());
+        //When movetodefaultsendCollection we move to -1
+        QCOMPARE(a->moveToCollection().id(), -1);
+        QCOMPARE(sendSilently, a->sendSilently());
+        SentBehaviourAttribute *copy = a->clone();
+        QCOMPARE(copy->sentBehaviour(), beh);
+        //When movetodefaultsendCollection we move to -1
+        QCOMPARE(copy->moveToCollection().id(), -1);
+        QCOMPARE(copy->sendSilently(), sendSilently);
+        delete a;
+        delete copy;
+    }
+
+    {
+        int id = 3219;
+        TransportAttribute *a = new TransportAttribute(id);
+        QByteArray data = a->serialized();
+        delete a;
+        a = new TransportAttribute;
+        a->deserialize(data);
+        QCOMPARE(id, a->transportId());
+        delete a;
+    }
+}
+
+QTEST_AKONADIMAIN(AttributeTest)
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/attributetest.h kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/attributetest.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/attributetest.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/attributetest.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,38 @@
+/*
+    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef ATTRIBUTETEST_H
+#define ATTRIBUTETEST_H
+
+#include <QtCore/QObject>
+
+/**
+  This is a test of the various attributes.
+*/
+class AttributeTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase();
+    void testRegistrar();
+    void testSerialization();
+};
+
+#endif
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/CMakeLists.txt kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/CMakeLists.txt
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/CMakeLists.txt	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,49 @@
+
+include(ECMMarkAsTest)
+
+find_package(Qt5Test CONFIG REQUIRED)
+
+macro(add_akonadi_isolated_test _source _path)
+  get_filename_component(_targetName ${_source} NAME_WE)
+  set(_srcList ${_source} )
+
+  add_executable(${_targetName} ${_srcList})
+  target_link_libraries(${_targetName}
+    Qt5::Test
+    KF5::AkonadiCore
+    KF5::AkonadiMime
+    KF5::MailTransportAkonadi
+    KF5::Mime
+    KF5::I18n
+    KF5::ConfigGui
+    Qt5::Widgets
+  )
+
+  # based on kde4_add_unit_test
+  if (WIN32)
+    get_target_property( _loc ${_targetName} LOCATION )
+    set(_executable ${_loc}.bat)
+  else()
+    set(_executable ${EXECUTABLE_OUTPUT_PATH}/${_targetName})
+  endif()
+  if (UNIX)
+    set(_executable ${_executable}.shell)
+  endif()
+
+  find_program(_testrunner akonaditest)
+
+  if (KDEPIMLIBS_RUN_ISOLATED_TESTS)
+    add_test( mailtransport-${_targetName} ${_testrunner} -c ${CMAKE_CURRENT_SOURCE_DIR}/${_path}/config.xml ${_executable} )
+  endif()
+endmacro(add_akonadi_isolated_test)
+
+
+
+# Akonadi testrunner-based tests:
+
+add_akonadi_isolated_test( attributetest.cpp unittestenv )
+add_akonadi_isolated_test( messagequeuejobtest.cpp unittestenv )
+MESSAGE(STATUS "REACTIVATE IT")
+if (KDEPIMLIBS_RUN_KDEPIMRUNTIME_ISOLATED_TESTS)
+   add_akonadi_isolated_test( filteractiontest.cpp unittestenv_akonadi )
+endif()
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/filteractiontest.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/filteractiontest.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/filteractiontest.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/filteractiontest.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,204 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "filteractiontest.h"
+#include <collectionpathresolver_p.h>
+#include <testattribute.h>
+
+#include <attributefactory.h>
+#include <collectioncreatejob.h>
+#include <itemcreatejob.h>
+#include <itemfetchjob.h>
+#include <itemfetchscope.h>
+#include <itemmodifyjob.h>
+#include <qtest_akonadi.h>
+#include <filteractionjob_p.h>
+
+using namespace Akonadi;
+
+QTEST_AKONADIMAIN(FilterActionTest, NoGUI)
+
+static const QByteArray acceptable = "acceptable";
+static const QByteArray unacceptable = "unacceptable";
+static const QByteArray modified = "modified";
+static Collection res1;
+
+class MyFunctor : public FilterAction
+{
+    virtual Akonadi::ItemFetchScope fetchScope() const
+    {
+        ItemFetchScope scope;
+        scope.fetchAttribute<TestAttribute>();
+        return scope;
+    }
+
+    virtual bool itemAccepted(const Akonadi::Item &item) const
+    {
+        if (!item.hasAttribute<TestAttribute>()) {
+            return false;
+        }
+        return item.attribute<TestAttribute>()->data == acceptable;
+    }
+
+    virtual Akonadi::Job *itemAction(const Akonadi::Item &item, FilterActionJob *parent) const
+    {
+        Item cp(item);
+        TestAttribute *newa = new TestAttribute;
+        newa->data = modified;
+        cp.addAttribute(newa);
+        return new ItemModifyJob(cp, parent);
+    }
+};
+
+void FilterActionTest::initTestCase()
+{
+    AttributeFactory::registerAttribute<TestAttribute>();
+
+    CollectionPathResolver *resolver = new CollectionPathResolver("res1", this);
+    QVERIFY(resolver->exec());
+    res1 = Collection(resolver->collection());
+}
+
+void FilterActionTest::testMassModifyItem()
+{
+    Collection col = createCollection("testMassModifyItem");
+
+    // Test acceptable item.
+    Item item = createItem(col, true);
+    FilterActionJob *mjob = new FilterActionJob(item, new MyFunctor, this);
+    AKVERIFYEXEC(mjob);
+    ItemFetchJob *fjob = new ItemFetchJob(item, this);
+    fjob->fetchScope().fetchAllAttributes();
+    AKVERIFYEXEC(fjob);
+    QCOMPARE(fjob->items().count(), 1);
+    item = fjob->items().first();
+    QVERIFY(item.hasAttribute<TestAttribute>());
+    TestAttribute *attr = item.attribute<TestAttribute>();
+    QCOMPARE(attr->data, modified);
+
+    // Test unacceptable item.
+    item = createItem(col, false);
+    mjob = new FilterActionJob(item, new MyFunctor, this);
+    AKVERIFYEXEC(mjob);
+    fjob = new ItemFetchJob(item, this);
+    fjob->fetchScope().fetchAllAttributes();
+    AKVERIFYEXEC(fjob);
+    QCOMPARE(fjob->items().count(), 1);
+    item = fjob->items().first();
+    QVERIFY(item.hasAttribute<TestAttribute>());
+    attr = item.attribute<TestAttribute>();
+    QCOMPARE(attr->data, unacceptable);
+}
+
+void FilterActionTest::testMassModifyItems()
+{
+    Collection col = createCollection("testMassModifyItems");
+
+    // Test a bunch of acceptable and unacceptable items.
+    Item::List acc, unacc;
+    for (int i = 0; i < 5; i++) {
+        acc.append(createItem(col, true));
+        unacc.append(createItem(col, false));
+    }
+    Item::List all = acc + unacc;
+    QCOMPARE(all.count(), 10);
+    FilterActionJob *mjob = new FilterActionJob(all, new MyFunctor, this);
+    AKVERIFYEXEC(mjob);
+    ItemFetchJob *fjob = new ItemFetchJob(col, this);
+    fjob->fetchScope().fetchAllAttributes();
+    AKVERIFYEXEC(fjob);
+    QCOMPARE(fjob->items().count(), 10);
+    foreach (const Item &item, fjob->items()) {
+        QVERIFY(item.hasAttribute<TestAttribute>());
+        const QByteArray data = item.attribute<TestAttribute>()->data;
+        if (data == unacceptable) {
+            QVERIFY(unacc.contains(item));
+            unacc.removeAll(item);
+        } else if (data == modified) {
+            QVERIFY(acc.contains(item));
+            acc.removeAll(item);
+        } else {
+            QVERIFY2(false, QByteArray(QByteArray("Got bad data \"") + data + QByteArray("\"")));
+        }
+    }
+    QCOMPARE(acc.count(), 0);
+    QCOMPARE(unacc.count(), 0);
+}
+
+void FilterActionTest::testMassModifyCollection()
+{
+    Collection col = createCollection("testMassModifyCollection");
+
+    // Test a bunch of acceptable and unacceptable items.
+    Item::List acc, unacc;
+    for (int i = 0; i < 5; i++) {
+        acc.append(createItem(col, true));
+        unacc.append(createItem(col, false));
+    }
+    FilterActionJob *mjob = new FilterActionJob(col, new MyFunctor, this);
+    qDebug() << "Executing FilterActionJob.";
+    AKVERIFYEXEC(mjob);
+    ItemFetchJob *fjob = new ItemFetchJob(col, this);
+    fjob->fetchScope().fetchAllAttributes();
+    AKVERIFYEXEC(fjob);
+    QCOMPARE(fjob->items().count(), 10);
+    foreach (const Item &item, fjob->items()) {
+        QVERIFY(item.hasAttribute<TestAttribute>());
+        const QByteArray data = item.attribute<TestAttribute>()->data;
+        if (data == unacceptable) {
+            QVERIFY(unacc.contains(item));
+            unacc.removeAll(item);
+        } else if (data == modified) {
+            QVERIFY(acc.contains(item));
+            acc.removeAll(item);
+        } else {
+            QVERIFY2(false, QByteArray(QByteArray("Got bad data \"") + data + QByteArray("\"")));
+        }
+    }
+    QCOMPARE(acc.count(), 0);
+    QCOMPARE(unacc.count(), 0);
+}
+
+Collection FilterActionTest::createCollection(const QString &name)
+{
+    Collection col;
+    col.setParentCollection(res1);
+    col.setName(name);
+    CollectionCreateJob *ccjob = new CollectionCreateJob(col, this);
+    Q_ASSERT(ccjob->exec());
+    return ccjob->collection();
+}
+
+Item FilterActionTest::createItem(const Collection &col, bool accept)
+{
+    Q_ASSERT(col.isValid());
+
+    Item item;
+    item.setMimeType("text/directory");
+    TestAttribute *attr = new TestAttribute;
+    if (accept) {
+        attr->data = acceptable;
+    } else {
+        attr->data = unacceptable;
+    }
+    item.addAttribute(attr);
+    ItemCreateJob *cjob = new ItemCreateJob(item, col, this);
+    Q_ASSERT(cjob->exec());
+    return cjob->item();
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/filteractiontest.h kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/filteractiontest.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/filteractiontest.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/filteractiontest.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,44 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef FILTERACTIONTEST_H
+#define FILTERACTIONTEST_H
+
+#include <QtCore/QObject>
+#include <QtCore/QString>
+
+#include <collection.h>
+#include <item.h>
+
+class FilterActionTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase();
+    void testMassModifyItem();
+    void testMassModifyItems();
+    void testMassModifyCollection();
+
+private:
+    Akonadi::Collection createCollection(const QString &name);
+    Akonadi::Item createItem(const Akonadi::Collection &col, bool accept);
+};
+
+#endif
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/messagequeuejobtest.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/messagequeuejobtest.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/messagequeuejobtest.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/messagequeuejobtest.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,188 @@
+/*
+    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "messagequeuejobtest.h"
+
+#include <QStringList>
+
+#include <agentinstance.h>
+#include <agentmanager.h>
+#include <collection.h>
+#include <collectionstatistics.h>
+#include <collectionstatisticsjob.h>
+#include <control.h>
+#include <itemfetchjob.h>
+#include <itemfetchscope.h>
+#include <itemdeletejob.h>
+#include <qtest_akonadi.h>
+#include <addressattribute.h>
+#include <messageflags.h>
+#include <specialmailcollections.h>
+#include <specialmailcollectionsrequestjob.h>
+
+#include <kmime/kmime_message.h>
+
+#include <kmailtransportakonadi/dispatchmodeattribute.h>
+#include <kmailtransportakonadi/errorattribute.h>
+#include <kmailtransportakonadi/messagequeuejob.h>
+#include <kmailtransportakonadi/sentbehaviourattribute.h>
+#include <transport.h>
+#include <kmailtransportakonadi/transportattribute.h>
+#include <transportmanager.h>
+#include <qsignalspy.h>
+
+#define SPAM_ADDRESS (QStringList() << QStringLiteral("idanoka@gmail.com"))
+
+using namespace Akonadi;
+using namespace KMime;
+using namespace MailTransport;
+
+void MessageQueueJobTest::initTestCase()
+{
+    Control::start();
+    // HACK: Otherwise the MDA is not switched offline soon enough apparently...
+    QTest::qWait(1000);
+
+    // Switch MDA offline to avoid spam.
+    AgentInstance mda = AgentManager::self()->instance(QStringLiteral("akonadi_maildispatcher_agent"));
+    QVERIFY(mda.isValid());
+    mda.setIsOnline(false);
+
+    // check that outbox is empty
+    SpecialMailCollectionsRequestJob *rjob = new SpecialMailCollectionsRequestJob(this);
+    rjob->requestDefaultCollection(SpecialMailCollections::Outbox);
+    QSignalSpy spy(rjob, SIGNAL(result(KJob *)));
+    QVERIFY(spy.wait(10000));
+    verifyOutboxContents(0);
+}
+
+void MessageQueueJobTest::testValidMessages()
+{
+    // check transport
+    int tid = TransportManager::self()->defaultTransportId();
+    QVERIFY2(tid >= 0, "I need a default transport, but there is none.");
+
+    // send a valid message using the default transport
+    MessageQueueJob *qjob = new MessageQueueJob;
+    qjob->transportAttribute().setTransportId(tid);
+    Message::Ptr msg = Message::Ptr(new Message);
+    msg->setContent("\nThis is message #1 from the MessageQueueJobTest unit test.\n");
+    qjob->setMessage(msg);
+    qjob->addressAttribute().setTo(SPAM_ADDRESS);
+    verifyOutboxContents(0);
+    AKVERIFYEXEC(qjob);
+
+    // fetch the message and verify it
+    QTest::qWait(1000);
+    verifyOutboxContents(1);
+    ItemFetchJob *fjob = new ItemFetchJob(
+        SpecialMailCollections::self()->defaultCollection(SpecialMailCollections::Outbox));
+    fjob->fetchScope().fetchFullPayload();
+    fjob->fetchScope().fetchAllAttributes();
+    AKVERIFYEXEC(fjob);
+    QCOMPARE(fjob->items().count(), 1);
+    Item item = fjob->items().constFirst();
+    QVERIFY(!item.remoteId().isEmpty());   // stored by the resource
+    QVERIFY(item.hasPayload<Message::Ptr>());
+    AddressAttribute *addrA = item.attribute<AddressAttribute>();
+    QVERIFY(addrA);
+    QVERIFY(addrA->from().isEmpty());
+    QCOMPARE(addrA->to().count(), 1);
+    QCOMPARE(addrA->to(), SPAM_ADDRESS);
+    QCOMPARE(addrA->cc().count(), 0);
+    QCOMPARE(addrA->bcc().count(), 0);
+    DispatchModeAttribute *dA = item.attribute<DispatchModeAttribute>();
+    QVERIFY(dA);
+    QCOMPARE(dA->dispatchMode(), DispatchModeAttribute::Automatic);   // default mode
+    SentBehaviourAttribute *sA = item.attribute<SentBehaviourAttribute>();
+    QVERIFY(sA);
+    // default sent collection
+    QCOMPARE(sA->sentBehaviour(), SentBehaviourAttribute::MoveToDefaultSentCollection);
+    TransportAttribute *tA = item.attribute<TransportAttribute>();
+    QVERIFY(tA);
+    QCOMPARE(tA->transportId(), tid);
+    ErrorAttribute *eA = item.attribute<ErrorAttribute>();
+    QVERIFY(!eA);   // no error
+    QCOMPARE(item.flags().count(), 1);
+    QVERIFY(item.flags().contains(Akonadi::MessageFlags::Queued));
+
+    // delete message, for further tests
+    ItemDeleteJob *djob = new ItemDeleteJob(item);
+    AKVERIFYEXEC(djob);
+    verifyOutboxContents(0);
+
+    // TODO test with no To: but only BCC:
+
+    // TODO test due-date sending
+
+    // TODO test sending with custom sent-mail collections
+}
+
+void MessageQueueJobTest::testInvalidMessages()
+{
+    MessageQueueJob *job = nullptr;
+    Message::Ptr msg;
+
+    // without message
+    job = new MessageQueueJob;
+    job->transportAttribute().setTransportId(TransportManager::self()->defaultTransportId());
+    job->addressAttribute().setTo(SPAM_ADDRESS);
+    QVERIFY(!job->exec());
+
+    // without recipients
+    job = new MessageQueueJob;
+    msg = Message::Ptr(new Message);
+    msg->setContent("\nThis is a message sent from the MessageQueueJobTest unittest."
+                    " This shouldn't have been sent.\n");
+    job->setMessage(msg);
+    job->transportAttribute().setTransportId(TransportManager::self()->defaultTransportId());
+    QVERIFY(!job->exec());
+
+    // without transport
+    job = new MessageQueueJob;
+    msg = Message::Ptr(new Message);
+    msg->setContent("\nThis is a message sent from the MessageQueueJobTest unittest."
+                    " This shouldn't have been sent.\n");
+    job->setMessage(msg);
+    job->addressAttribute().setTo(SPAM_ADDRESS);
+    QVERIFY(!job->exec());
+
+    // with MoveToCollection and no sent-mail folder
+    job = new MessageQueueJob;
+    msg = Message::Ptr(new Message);
+    msg->setContent("\nThis is a message sent from the MessageQueueJobTest unittest."
+                    " This shouldn't have been sent.\n");
+    job->setMessage(msg);
+    job->addressAttribute().setTo(SPAM_ADDRESS);
+    job->sentBehaviourAttribute().setSentBehaviour(SentBehaviourAttribute::MoveToCollection);
+    QVERIFY(!job->exec());
+}
+
+void MessageQueueJobTest::verifyOutboxContents(qlonglong count)
+{
+    QVERIFY(SpecialMailCollections::self()->hasDefaultCollection(SpecialMailCollections::Outbox));
+    Collection outbox
+        = SpecialMailCollections::self()->defaultCollection(SpecialMailCollections::Outbox);
+    QVERIFY(outbox.isValid());
+    CollectionStatisticsJob *job = new CollectionStatisticsJob(outbox);
+    AKVERIFYEXEC(job);
+    QCOMPARE(job->statistics().count(), count);
+}
+
+QTEST_AKONADIMAIN(MessageQueueJobTest)
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/messagequeuejobtest.h kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/messagequeuejobtest.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/messagequeuejobtest.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/messagequeuejobtest.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,43 @@
+/*
+    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MESSAGEQUEUEJOBTEST_H
+#define MESSAGEQUEUEJOBTEST_H
+
+#include <QtCore/QObject>
+
+/**
+  This tests the ability to queue messages (MessageQueueJob class).
+  Note that the actual sending of messages is the MDA's job, and is not tested
+  here.
+ */
+class MessageQueueJobTest : public QObject
+{
+    Q_OBJECT
+
+private Q_SLOTS:
+    void initTestCase();
+    void testValidMessages();
+    void testInvalidMessages();
+
+private:
+    void verifyOutboxContents(qlonglong count);
+};
+
+#endif
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/testattribute.h kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/testattribute.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/testattribute.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/testattribute.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,58 @@
+/*
+    Copyright (c) 2008 Volker Krause <vkrause@kde.org>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef TESTATTRIBUTE_H
+#define TESTATTRIBUTE_H
+
+#include <attribute.h>
+
+/* Attribute used for testing by various unit tests. */
+class TestAttribute : public Akonadi::Attribute
+{
+public:
+    TestAttribute()
+    {
+    }
+
+    QByteArray type() const
+    {
+        return "EXTRA";
+    }
+
+    QByteArray serialized() const
+    {
+        return data;
+    }
+
+    void deserialize(const QByteArray &ba)
+    {
+        data = ba;
+    }
+
+    TestAttribute *clone() const
+    {
+        TestAttribute *a = new TestAttribute;
+        a->data = data;
+        return a;
+    }
+
+    QByteArray data;
+};
+
+#endif
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/TODO kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/TODO
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/TODO	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/TODO	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,6 @@
+MessageQueueJob:
+- see source
+
+Attributes:
+- add test for common mistakes such as forgetting to setDueDate
+
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv/config.xml kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv/config.xml
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv/config.xml	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv/config.xml	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,5 @@
+<config>
+  <kdehome>kdehome</kdehome>
+  <confighome>xdgconfig</confighome>
+  <datahome>xdglocal</datahome>
+</config>
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv/kdehome/share/config/akonadi-firstrunrc	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,3 @@
+[ProcessedDefaults]
+defaultaddressbook=done
+defaultcalendar=done
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv/kdehome/share/config/kwalletrc kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv/kdehome/share/config/kwalletrc
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv/kdehome/share/config/kwalletrc	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv/kdehome/share/config/kwalletrc	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,2 @@
+[Wallet]
+Enabled=false
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv/kdehome/share/config/mailtransports kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv/kdehome/share/config/mailtransports
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv/kdehome/share/config/mailtransports	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv/kdehome/share/config/mailtransports	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,17 @@
+[$Version]
+update_info=mailtransports.upd:initial-kmail-migration,mailtransports.upd:initial-knode-migration
+
+[General]
+default-transport=549190884
+
+[Transport 549190884]
+auth=true
+encryption=SSL
+host=smtp.gmail.com
+id=549190884
+name=idanoka2-stored
+password=ﾾﾴﾰﾱﾾﾻﾶﾫﾺﾬﾫ
+port=465
+storepass=true
+user=idanoka2@gmail.com
+
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv/kdehome/share/config/qttestrc kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv/kdehome/share/config/qttestrc
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv/kdehome/share/config/qttestrc	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv/kdehome/share/config/qttestrc	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,2 @@
+[Notification Messages]
+WalletMigrate=false
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv/xdgconfig/akonadi/akonadiserverrc kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv/xdgconfig/akonadi/akonadiserverrc
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv/xdgconfig/akonadi/akonadiserverrc	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv/xdgconfig/akonadi/akonadiserverrc	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,5 @@
+[%General]
+Driver=QSQLITE
+
+[Search]
+Manager=Dummy
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-mysql-db.xml kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-mysql-db.xml
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-mysql-db.xml	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-mysql-db.xml	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,9 @@
+<config>
+  <kdehome>kdehome</kdehome>
+  <confighome>xdgconfig-mysql.db</confighome>
+  <datahome>xdglocal</datahome>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
+</config>
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-mysql-fs.xml kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-mysql-fs.xml
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-mysql-fs.xml	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-mysql-fs.xml	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,9 @@
+<config>
+  <kdehome>kdehome</kdehome>
+  <confighome>xdgconfig-mysql.fs</confighome>
+  <datahome>xdglocal</datahome>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
+</config>
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-postgresql-db.xml kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-postgresql-db.xml
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-postgresql-db.xml	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-postgresql-db.xml	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,9 @@
+<config>
+  <kdehome>kdehome</kdehome>
+  <confighome>xdgconfig-postgresql.db</confighome>
+  <datahome>xdglocal</datahome>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
+</config>
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-postgresql-fs.xml kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-postgresql-fs.xml
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-postgresql-fs.xml	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-postgresql-fs.xml	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,9 @@
+<config>
+  <kdehome>kdehome</kdehome>
+  <confighome>xdgconfig-postgresql.fs</confighome>
+  <datahome>xdglocal</datahome>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
+</config>
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-sqlite.xml kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-sqlite.xml
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-sqlite.xml	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config-sqlite.xml	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,9 @@
+<config>
+  <kdehome>kdehome</kdehome>
+  <confighome>xdgconfig.sqlite</confighome>
+  <datahome>xdglocal</datahome>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
+</config>
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config.xml kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config.xml
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config.xml	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/config.xml	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,9 @@
+<config>
+  <kdehome>kdehome</kdehome>
+  <confighome>xdgconfig</confighome>
+  <datahome>xdglocal</datahome>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <agent synchronize="true">akonadi_knut_resource</agent>
+  <envvar name="AKONADI_DISABLE_AGENT_AUTOSTART">true</envvar>
+</config>
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/share/config/akonadi-firstrunrc kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/share/config/akonadi-firstrunrc
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/share/config/akonadi-firstrunrc	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/share/config/akonadi-firstrunrc	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,3 @@
+[ProcessedDefaults]
+defaultaddressbook=done
+defaultcalendar=done
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_0rc kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_0rc
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_0rc	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_0rc	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,4 @@
+[General]
+DataFile[$e]=$KDEHOME/testdata-res1.xml
+FileWatchingEnabled=false
+
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_1rc kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_1rc
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_1rc	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_1rc	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,3 @@
+[General]
+DataFile[$e]=$KDEHOME/testdata-res2.xml
+FileWatchingEnabled=false
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_2rc kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_2rc
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_2rc	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/share/config/akonadi_knut_resource_2rc	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,3 @@
+[General]
+DataFile[$e]=$KDEHOME/testdata-res3.xml
+FileWatchingEnabled=false
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/testdata-res1.xml kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/testdata-res1.xml
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/testdata-res1.xml	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/testdata-res1.xml	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,78 @@
+<knut>
+ <collection rid="6" name="res1" content="inode/directory">
+  <collection rid="10" name="foo" content="inode/directory,application/octet-stream,text/directory,text/calendar,message/rfc822">
+   <collection rid="2" name="bar" content="inode/directory">
+    <collection rid="3" name="bla" content="inode/directory">
+    </collection>
+   </collection>
+   <collection rid="4" name="bla" content="inode/directory">
+   </collection>
+   <item rid="A" mimetype="application/octet-stream">
+    <payload>testmailbody</payload>
+    <attribute type="HEAD">From: &lt;test@user.tst&gt;</attribute>
+    <flag>\SEEN</flag>
+    <flag>\FLAGGED</flag>
+    <flag>\DRAFT</flag>
+   </item>
+   <item rid="B" mimetype="application/octet-stream">
+    <payload>testmailbody1</payload>
+    <attribute type="HEAD">From: &lt;test1@user.tst&gt;</attribute>
+    <flag>\FLAGGED</flag>
+    <tag>tagrid</tag>
+   </item>
+   <item rid="C" mimetype="application/octet-stream">
+    <payload>testmailbody2</payload>
+    <attribute type="HEAD">From: &lt;test2@user.tst&gt;</attribute>
+   </item>
+   <item rid="D" mimetype="application/octet-stream">
+    <payload>testmailbody3</payload>
+    <attribute type="HEAD">From: &lt;test3@user.tst&gt;</attribute>
+   </item>
+   <item rid="E" mimetype="application/octet-stream">
+    <payload>testmailbody4</payload>
+    <attribute type="HEAD">From: &lt;test4@user.tst&gt;</attribute>
+   </item>
+   <item rid="F" mimetype="application/octet-stream">
+    <payload>testmailbody5</payload>
+    <attribute type="HEAD">From: &lt;test5@user.tst&gt;</attribute>
+   </item>
+   <item rid="G" mimetype="application/octet-stream">
+    <payload>testmailbody6</payload>
+    <attribute type="HEAD">From: &lt;test6@user.tst&gt;</attribute>
+   </item>
+   <item rid="H" mimetype="application/octet-stream">
+    <payload>testmailbody7</payload>
+    <attribute type="HEAD">From: &lt;test7@user.tst&gt;</attribute>
+   </item>
+   <item rid="I" mimetype="application/octet-stream">
+    <payload>testmailbody8</payload>
+    <attribute type="HEAD">From: &lt;test8@user.tst&gt;</attribute>
+   </item>
+   <item rid="J" mimetype="application/octet-stream">
+    <payload>testmailbody9</payload>
+    <attribute type="HEAD">From: &lt;test9@user.tst&gt;</attribute>
+   </item>
+   <item rid="K" mimetype="application/octet-stream">
+    <payload>testmailbody10</payload>
+    <attribute type="HEAD">From: &lt;test10@user.tst&gt;</attribute>
+   </item>
+   <item rid="L" mimetype="application/octet-stream">
+    <payload>testmailbody11</payload>
+    <attribute type="HEAD">From: &lt;test11@user.tst&gt;</attribute>
+   </item>
+   <item rid="M" mimetype="application/octet-stream">
+    <payload>testmailbody12</payload>
+    <attribute type="HEAD">From: &lt;test12@user.tst&gt;</attribute>
+   </item>
+   <item rid="N" mimetype="application/octet-stream">
+    <payload>testmailbody13</payload>
+    <attribute type="HEAD">From: &lt;test13@user.tst&gt;</attribute>
+   </item>
+   <item rid="O" mimetype="application/octet-stream">
+    <payload>testmailbody14</payload>
+    <attribute type="HEAD">From: &lt;test14@user.tst&gt;</attribute>
+   </item>
+  </collection>
+ </collection>
+ <tag name="name" type="type" gid="taggid" rid="tagrid"></tag>
+</knut>
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/testdata-res2.xml kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/testdata-res2.xml
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/testdata-res2.xml	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/testdata-res2.xml	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,6 @@
+<knut>
+ <collection rid="7" name="res2" content="inode/directory">
+  <collection rid="5" name="foo2" content=""/>
+  <collection rid="9" name="space folder" content=""/>
+ </collection>
+</knut>
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/testdata-res3.xml kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/testdata-res3.xml
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/testdata-res3.xml	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/testdata-res3.xml	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,4 @@
+<knut>
+ <collection rid="8" name="res3" content="inode/directory,application/octet-stream">
+ </collection>
+</knut>
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/testdata.xml kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/testdata.xml
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/testdata.xml	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/kdehome/testdata.xml	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,82 @@
+<knut>
+ <collection rid="6" name="res1" content="inode/directory">
+  <collection rid="10" name="foo" content="inode/directory,application/octet-stream,text/directory,text/calendar">
+   <collection rid="2" name="bar" content="inode/directory">
+    <collection rid="3" name="bla" content="inode/directory">
+    </collection>
+   </collection>
+   <collection rid="4" name="bla" content="inode/directory">
+   </collection>
+   <item rid="A" mimetype="application/octet-stream">
+    <payload>testmailbody</payload>
+    <attribute type="HEAD">From: &lt;test@user.tst&gt;</attribute>
+    <flag>\SEEN</flag>
+    <flag>\FLAGGED</flag>
+    <flag>\DRAFT</flag>
+   </item>
+   <item rid="B" mimetype="application/octet-stream">
+    <payload>testmailbody1</payload>
+    <attribute type="HEAD">From: &lt;test1@user.tst&gt;</attribute>
+    <flag>\FLAGGED</flag>
+   </item>
+   <item rid="C" mimetype="application/octet-stream">
+    <payload>testmailbody2</payload>
+    <attribute type="HEAD">From: &lt;test2@user.tst&gt;</attribute>
+   </item>
+   <item rid="D" mimetype="application/octet-stream">
+    <payload>testmailbody3</payload>
+    <attribute type="HEAD">From: &lt;test3@user.tst&gt;</attribute>
+   </item>
+   <item rid="E" mimetype="application/octet-stream">
+    <payload>testmailbody4</payload>
+    <attribute type="HEAD">From: &lt;test4@user.tst&gt;</attribute>
+   </item>
+   <item rid="F" mimetype="application/octet-stream">
+    <payload>testmailbody5</payload>
+    <attribute type="HEAD">From: &lt;test5@user.tst&gt;</attribute>
+   </item>
+   <item rid="G" mimetype="application/octet-stream">
+    <payload>testmailbody6</payload>
+    <attribute type="HEAD">From: &lt;test6@user.tst&gt;</attribute>
+   </item>
+   <item rid="H" mimetype="application/octet-stream">
+    <payload>testmailbody7</payload>
+    <attribute type="HEAD">From: &lt;test7@user.tst&gt;</attribute>
+   </item>
+   <item rid="I" mimetype="application/octet-stream">
+    <payload>testmailbody8</payload>
+    <attribute type="HEAD">From: &lt;test8@user.tst&gt;</attribute>
+   </item>
+   <item rid="J" mimetype="application/octet-stream">
+    <payload>testmailbody9</payload>
+    <attribute type="HEAD">From: &lt;test9@user.tst&gt;</attribute>
+   </item>
+   <item rid="K" mimetype="application/octet-stream">
+    <payload>testmailbody10</payload>
+    <attribute type="HEAD">From: &lt;test10@user.tst&gt;</attribute>
+   </item>
+   <item rid="L" mimetype="application/octet-stream">
+    <payload>testmailbody11</payload>
+    <attribute type="HEAD">From: &lt;test11@user.tst&gt;</attribute>
+   </item>
+   <item rid="M" mimetype="application/octet-stream">
+    <payload>testmailbody12</payload>
+    <attribute type="HEAD">From: &lt;test12@user.tst&gt;</attribute>
+   </item>
+   <item rid="N" mimetype="application/octet-stream">
+    <payload>testmailbody13</payload>
+    <attribute type="HEAD">From: &lt;test13@user.tst&gt;</attribute>
+   </item>
+   <item rid="O" mimetype="application/octet-stream">
+    <payload>testmailbody14</payload>
+    <attribute type="HEAD">From: &lt;test14@user.tst&gt;</attribute>
+   </item>
+  </collection>
+ </collection>
+ <collection rid="7" name="res2" content="inode/directory">
+  <collection rid="5" name="foo2" content=""/>
+  <collection rid="9" name="space folder" content=""/>
+ </collection>
+ <collection rid="8" name="res3" content="inode/directory,application/octet-stream">
+ </collection>
+</knut>
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig-mysql.db/akonadi/akonadiserverrc kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig-mysql.db/akonadi/akonadiserverrc
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig-mysql.db/akonadi/akonadiserverrc	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig-mysql.db/akonadi/akonadiserverrc	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,5 @@
+[%General]
+ExternalPayload=false
+
+[Search]
+Manager=Dummy
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig-mysql.fs/akonadi/akonadiserverrc kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig-mysql.fs/akonadi/akonadiserverrc
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig-mysql.fs/akonadi/akonadiserverrc	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig-mysql.fs/akonadi/akonadiserverrc	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,6 @@
+[%General]
+SizeThreshold=0
+ExternalPayload=true
+
+[Search]
+Manager=Dummy
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig-postgresql.db/akonadi/akonadiserverrc kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig-postgresql.db/akonadi/akonadiserverrc
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig-postgresql.db/akonadi/akonadiserverrc	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig-postgresql.db/akonadi/akonadiserverrc	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,15 @@
+[%General]
+Driver=QPSQL
+ExternalPayload=false
+
+[Search]
+Manager=Dummy
+
+[QPSQL]
+Name=post_table
+User=user
+Password=pass
+Options=
+StartServer=false
+Host=
+Port=5432
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig-postgresql.fs/akonadi/akonadiserverrc kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig-postgresql.fs/akonadi/akonadiserverrc
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig-postgresql.fs/akonadi/akonadiserverrc	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig-postgresql.fs/akonadi/akonadiserverrc	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,17 @@
+[%General]
+Driver=QPSQL
+SizeThreshold=0
+ExternalPayload=true
+
+[Search]
+Manager=Dummy
+
+[QPSQL]
+Name=post_table
+User=user
+Password=pass
+Options=
+StartServer=false
+Host=
+Port=5432
+
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig.sqlite/akonadi/akonadiserverrc kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig.sqlite/akonadi/akonadiserverrc
--- kmailtransport-16.12.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig.sqlite/akonadi/akonadiserverrc	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/autotests/unittestenv_akonadi/xdgconfig.sqlite/akonadi/akonadiserverrc	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,6 @@
+[%General]
+Driver=QSQLITE
+
+[Debug]
+Tracer=null
+
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/CMakeLists.txt kmailtransport-17.04.3/src/kmailtransportakonadi/CMakeLists.txt
--- kmailtransport-16.12.3/src/kmailtransportakonadi/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/CMakeLists.txt	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,113 @@
+ecm_setup_version(PROJECT VARIABLE_PREFIX MAILTRANSPORT
+    VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/mailtransportakonadi_version.h"
+    PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5MailTransportAkonadiConfigVersion.cmake"
+    SOVERSION 5
+    )
+
+
+
+
+set(mailtransportakonadi_lib_srcs
+    dispatcherinterface.cpp
+    attributeregistrar.cpp
+    dispatchmodeattribute.cpp
+    errorattribute.cpp
+    transportattribute.cpp
+    sentactionattribute.cpp
+    sentbehaviourattribute.cpp
+    messagequeuejob.cpp
+    outboxactions.cpp
+    filteractionjob.cpp
+    )
+
+ecm_qt_declare_logging_category(mailtransportakonadi_lib_srcs HEADER mailtransportakonadi_debug.h IDENTIFIER MAILTRANSPORTAKONADI_LOG CATEGORY_NAME org.kde.pim.mailtransportakonadi)
+
+add_library(KF5MailTransportAkonadi ${mailtransportakonadi_lib_srcs}
+    )
+
+generate_export_header(KF5MailTransportAkonadi BASE_NAME mailtransportakonadi)
+
+add_library(KF5::MailTransportAkonadi ALIAS KF5MailTransportAkonadi)
+
+
+target_include_directories(KF5MailTransportAkonadi INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/MailTransportAkonadi;${KDE_INSTALL_INCLUDEDIR_KF5}/mailtransportakonadi>")
+target_include_directories(KF5MailTransportAkonadi PUBLIC "$<BUILD_INTERFACE:${MailTransport_SOURCE_DIR}/src;${MailTransport_BINARY_DIR}/src>")
+
+
+target_link_libraries(KF5MailTransportAkonadi
+    PUBLIC
+    KF5::AkonadiCore
+    KF5::Mime
+    KF5::AkonadiMime
+    KF5::MailTransport
+    PRIVATE
+    KF5::I18n
+    KF5::CoreAddons
+    KF5::ConfigGui
+    )
+
+set_target_properties(KF5MailTransportAkonadi PROPERTIES
+    VERSION ${MAILTRANSPORT_VERSION_STRING}
+    SOVERSION ${MAILTRANSPORT_SOVERSION}
+    EXPORT_NAME MailTransportAkonadi
+    )
+
+
+install(TARGETS KF5MailTransportAkonadi EXPORT KF5MailTransportAkonadiTargets ${KF5_INSTALL_TARGETS_DEFAULT_ARGS})
+
+ecm_generate_headers(MailTransport_kmailtransportakonadi_CamelCase_HEADERS
+    HEADER_NAMES
+    DispatcherInterface
+    MessageQueueJob
+    TransportAttribute
+    SentBehaviourAttribute
+    DispatchModeAttribute
+    ErrorAttribute
+    SentActionAttribute
+    PREFIX MailTransportAkonadi
+    REQUIRED_HEADERS MailTransport_kmailtransportakonadi_HEADERS
+    )
+
+install(FILES
+    ${MailTransport_kmailtransportakonadi_CamelCase_HEADERS}
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/MailTransportAkonadi COMPONENT Devel )
+
+install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/mailtransportakonadi_export.h
+    ${MailTransport_kmailtransportakonadi_HEADERS}
+
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/mailtransportakonadi COMPONENT Devel
+    )
+
+ecm_generate_pri_file(BASE_NAME KMailTransportAkonadi LIB_NAME KF5MailTransportAkonadi DEPS "MailTransport AkonadiCore Mime AkonadiMime" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/MailTransportAkonadi/)
+install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
+
+
+set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5MailTransportAkonadi")
+
+install(EXPORT KF5MailTransportAkonadiTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE KF5MailTransportAkonadiTargets.cmake NAMESPACE KF5::)
+
+configure_package_config_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/KF5MailTransportAkonadiConfig.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/KF5MailTransportAkonadiConfig.cmake"
+    INSTALL_DESTINATION  ${CMAKECONFIG_INSTALL_DIR}
+    )
+
+install(FILES
+    "${CMAKE_CURRENT_BINARY_DIR}/KF5MailTransportAkonadiConfig.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/KF5MailTransportAkonadiConfigVersion.cmake"
+    DESTINATION "${CMAKECONFIG_INSTALL_DIR}"
+    COMPONENT Devel
+    )
+
+
+install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/mailtransportakonadi_version.h
+    DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel
+    )
+
+if(BUILD_TESTING)
+    add_subdirectory(tests)
+    add_subdirectory(autotests)
+endif()
+
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/dispatcherinterface.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/dispatcherinterface.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/dispatcherinterface.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/dispatcherinterface.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,101 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "dispatcherinterface.h"
+#include "dispatcherinterface_p.h"
+
+#include "kmailtransportakonadi/outboxactions_p.h"
+
+#include "mailtransportakonadi_debug.h"
+
+#include <agentmanager.h>
+#include <collection.h>
+#include <specialmailcollections.h>
+#include "kmailtransportakonadi/transportattribute.h"
+
+using namespace Akonadi;
+using namespace MailTransport;
+
+Q_GLOBAL_STATIC(DispatcherInterfacePrivate, sInstance)
+
+void DispatcherInterfacePrivate::massModifyResult(KJob *job)
+{
+    // Nothing to do here, really.  If the job fails, the user can retry it.
+    if (job->error()) {
+        qCDebug(MAILTRANSPORTAKONADI_LOG) << "failed" << job->errorString();
+    } else {
+        qCDebug(MAILTRANSPORTAKONADI_LOG) << "succeeded.";
+    }
+}
+
+DispatcherInterface::DispatcherInterface()
+{
+}
+
+AgentInstance DispatcherInterface::dispatcherInstance() const
+{
+    AgentInstance a
+        = AgentManager::self()->instance(QStringLiteral("akonadi_maildispatcher_agent"));
+    if (!a.isValid()) {
+        qCWarning(MAILTRANSPORTAKONADI_LOG) << "Could not get MDA instance.";
+    }
+    return a;
+}
+
+void DispatcherInterface::dispatchManually()
+{
+    Collection outbox
+        = SpecialMailCollections::self()->defaultCollection(SpecialMailCollections::Outbox);
+    if (!outbox.isValid()) {
+//    qCritical() << "Could not access Outbox.";
+        return;
+    }
+
+    FilterActionJob *mjob = new FilterActionJob(outbox, new SendQueuedAction, sInstance);
+    QObject::connect(mjob, &KJob::result, sInstance(), &DispatcherInterfacePrivate::massModifyResult);
+}
+
+void DispatcherInterface::retryDispatching()
+{
+    Collection outbox
+        = SpecialMailCollections::self()->defaultCollection(SpecialMailCollections::Outbox);
+    if (!outbox.isValid()) {
+//    qCritical() << "Could not access Outbox.";
+        return;
+    }
+
+    FilterActionJob *mjob = new FilterActionJob(outbox, new ClearErrorAction, sInstance);
+    QObject::connect(mjob, &KJob::result, sInstance(), &DispatcherInterfacePrivate::massModifyResult);
+}
+
+void DispatcherInterface::dispatchManualTransport(int transportId)
+{
+    Collection outbox
+        = SpecialMailCollections::self()->defaultCollection(SpecialMailCollections::Outbox);
+    if (!outbox.isValid()) {
+//    qCritical() << "Could not access Outbox.";
+        return;
+    }
+
+    FilterActionJob *mjob
+        = new FilterActionJob(outbox, new DispatchManualTransportAction(transportId), sInstance);
+    QObject::connect(mjob, &KJob::result, sInstance(), &DispatcherInterfacePrivate::massModifyResult);
+}
+
+#include "moc_dispatcherinterface_p.cpp"
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/dispatcherinterface.h kmailtransport-17.04.3/src/kmailtransportakonadi/dispatcherinterface.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/dispatcherinterface.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/dispatcherinterface.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,80 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_DISPATCHERINTERFACE_H
+#define MAILTRANSPORT_DISPATCHERINTERFACE_H
+
+#include <mailtransportakonadi_export.h>
+
+#include <agentinstance.h>
+
+//krazy:excludeall=dpointer
+
+namespace MailTransport {
+/**
+  @short An interface for applications to interact with the dispatcher agent.
+
+  This class provides methods such as send queued messages (@see
+  dispatchManually) and retry sending (@see retryDispatching).
+
+  This class also takes care of registering the attributes that the mail
+  dispatcher agent and MailTransport use.
+
+  @author Constantin Berzan <exit3219@gmail.com>
+  @since 4.4
+*/
+class MAILTRANSPORTAKONADI_EXPORT DispatcherInterface
+{
+public:
+
+    /**
+      Creates a new dispatcher interface.
+    */
+    DispatcherInterface();
+
+    /**
+      Returns the current instance of the mail dispatcher agent. May return an invalid
+      AgentInstance in case it cannot find the mail dispatcher agent.
+    */
+    Akonadi::AgentInstance dispatcherInstance() const;
+
+    /**
+      Looks for messages in the outbox with DispatchMode::Manual and marks them
+      DispatchMode::Automatic for sending.
+    */
+    void dispatchManually();
+
+    /**
+      Looks for messages in the outbox with ErrorAttribute, and clears them and
+      queues them again for sending.
+    */
+    void retryDispatching();
+
+    /**
+      Looks for messages in the outbox with DispatchMode::Manual and changes the
+      Transport for them to the one with id @p transportId.
+
+      @param transportId the transport to dispatch "manual dispatch" messages with
+      @since 4.5
+    */
+    void dispatchManualTransport(int transportId);
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_DISPATCHERINTERFACE_H
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/dispatcherinterface_p.h kmailtransport-17.04.3/src/kmailtransportakonadi/dispatcherinterface_p.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/dispatcherinterface_p.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/dispatcherinterface_p.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,41 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+#ifndef MAILTRANSPORT_DISPATCHERINTERFACE_P_H
+#define MAILTRANSPORT_DISPATCHERINTERFACE_P_H
+
+#include <QtCore/QObject>
+
+class KJob;
+
+namespace MailTransport {
+/**
+  @internal
+*/
+class DispatcherInterfacePrivate : public QObject
+{
+    Q_OBJECT
+
+public:
+
+public Q_SLOTS:
+    void massModifyResult(KJob *job);
+};
+}
+
+#endif
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/dispatchmodeattribute.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/dispatchmodeattribute.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/dispatchmodeattribute.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/dispatchmodeattribute.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,111 @@
+/*
+    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "dispatchmodeattribute.h"
+
+#include "mailtransportakonadi_debug.h"
+
+#include <attributefactory.h>
+
+using namespace Akonadi;
+using namespace MailTransport;
+
+class Q_DECL_HIDDEN DispatchModeAttribute::Private
+{
+public:
+    DispatchMode mMode;
+    QDateTime mDueDate;
+};
+
+DispatchModeAttribute::DispatchModeAttribute(DispatchMode mode)
+    : d(new Private)
+{
+    d->mMode = mode;
+}
+
+DispatchModeAttribute::~DispatchModeAttribute()
+{
+    delete d;
+}
+
+DispatchModeAttribute *DispatchModeAttribute::clone() const
+{
+    DispatchModeAttribute *const cloned = new DispatchModeAttribute(d->mMode);
+    cloned->setSendAfter(d->mDueDate);
+    return cloned;
+}
+
+QByteArray DispatchModeAttribute::type() const
+{
+    static const QByteArray sType("DispatchModeAttribute");
+    return sType;
+}
+
+QByteArray DispatchModeAttribute::serialized() const
+{
+    switch (d->mMode) {
+    case Automatic:
+        if (!d->mDueDate.isValid()) {
+            return "immediately";
+        } else {
+            return "after" + d->mDueDate.toString(Qt::ISODate).toLatin1();
+        }
+    case Manual:
+        return "never";
+    }
+
+    Q_ASSERT(false);
+    return QByteArray(); // suppress control-reaches-end-of-non-void-function warning
+}
+
+void DispatchModeAttribute::deserialize(const QByteArray &data)
+{
+    d->mDueDate = QDateTime();
+    if (data == "immediately") {
+        d->mMode = Automatic;
+    } else if (data == "never") {
+        d->mMode = Manual;
+    } else if (data.startsWith(QByteArray("after"))) {
+        d->mMode = Automatic;
+        d->mDueDate = QDateTime::fromString(QString::fromLatin1(data.mid(5)), Qt::ISODate);
+        // NOTE: 5 is the strlen of "after".
+    } else {
+        qCWarning(MAILTRANSPORTAKONADI_LOG) << "Failed to deserialize data [" << data << "]";
+    }
+}
+
+DispatchModeAttribute::DispatchMode DispatchModeAttribute::dispatchMode() const
+{
+    return d->mMode;
+}
+
+void DispatchModeAttribute::setDispatchMode(DispatchMode mode)
+{
+    d->mMode = mode;
+}
+
+QDateTime DispatchModeAttribute::sendAfter() const
+{
+    return d->mDueDate;
+}
+
+void DispatchModeAttribute::setSendAfter(const QDateTime &date)
+{
+    d->mDueDate = date;
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/dispatchmodeattribute.h kmailtransport-17.04.3/src/kmailtransportakonadi/dispatchmodeattribute.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/dispatchmodeattribute.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/dispatchmodeattribute.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,98 @@
+/*
+    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_DISPATCHMODEATTRIBUTE_H
+#define MAILTRANSPORT_DISPATCHMODEATTRIBUTE_H
+
+#include <mailtransportakonadi_export.h>
+
+#include <QtCore/QDateTime>
+
+#include <attribute.h>
+
+namespace MailTransport {
+/**
+  Attribute determining how and when a message from the outbox should be
+  dispatched.  Messages can be sent immediately, sent only when the user
+  explicitly requests it, or sent automatically at a certain date and time.
+
+  @author Constantin Berzan <exit3219@gmail.com>
+  @since 4.4
+*/
+class MAILTRANSPORTAKONADI_EXPORT DispatchModeAttribute : public Akonadi::Attribute
+{
+public:
+    /**
+      Determines how the message is sent.
+    */
+    enum DispatchMode {
+        Automatic,    ///< Send message as soon as possible, but no earlier than
+        ///  specified by setSendAfter()
+        Manual        ///< Send message only when the user requests so.
+    };
+
+    /**
+      Creates a new DispatchModeAttribute.
+    */
+    explicit DispatchModeAttribute(DispatchMode mode = Automatic);
+
+    /**
+      Destroys the DispatchModeAttribute.
+    */
+    virtual ~DispatchModeAttribute();
+
+    /* reimpl */
+    DispatchModeAttribute *clone() const Q_DECL_OVERRIDE;
+    QByteArray type() const Q_DECL_OVERRIDE;
+    QByteArray serialized() const Q_DECL_OVERRIDE;
+    void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+
+    /**
+      Returns the dispatch mode for the message.
+      @see DispatchMode.
+    */
+    DispatchMode dispatchMode() const;
+
+    /**
+      Sets the dispatch mode for the message.
+      @param mode the dispatch mode to set
+      @see DispatchMode.
+    */
+    void setDispatchMode(DispatchMode mode);
+
+    /**
+      Returns the date and time when the message should be sent.
+      Only valid if dispatchMode() is Automatic.
+    */
+    QDateTime sendAfter() const;
+
+    /**
+      Sets the date and time when the message should be sent.
+      @param date the date and time to set
+      @see setDispatchMode.
+    */
+    void setSendAfter(const QDateTime &date);
+
+private:
+    class Private;
+    Private *const d;
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_DISPATCHMODEATTRIBUTE_H
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/errorattribute.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/errorattribute.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/errorattribute.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/errorattribute.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,71 @@
+/*
+    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "errorattribute.h"
+
+using namespace Akonadi;
+using namespace MailTransport;
+
+class Q_DECL_HIDDEN ErrorAttribute::Private
+{
+public:
+    QString mMessage;
+};
+
+ErrorAttribute::ErrorAttribute(const QString &msg)
+    : d(new Private)
+{
+    d->mMessage = msg;
+}
+
+ErrorAttribute::~ErrorAttribute()
+{
+    delete d;
+}
+
+ErrorAttribute *ErrorAttribute::clone() const
+{
+    return new ErrorAttribute(d->mMessage);
+}
+
+QByteArray ErrorAttribute::type() const
+{
+    static const QByteArray sType("ErrorAttribute");
+    return sType;
+}
+
+QByteArray ErrorAttribute::serialized() const
+{
+    return d->mMessage.toUtf8();
+}
+
+void ErrorAttribute::deserialize(const QByteArray &data)
+{
+    d->mMessage = QString::fromUtf8(data);
+}
+
+QString ErrorAttribute::message() const
+{
+    return d->mMessage;
+}
+
+void ErrorAttribute::setMessage(const QString &msg)
+{
+    d->mMessage = msg;
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/errorattribute.h kmailtransport-17.04.3/src/kmailtransportakonadi/errorattribute.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/errorattribute.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/errorattribute.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,77 @@
+/*
+    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_ERRORATTRIBUTE_H
+#define MAILTRANSPORT_ERRORATTRIBUTE_H
+
+#include <mailtransportakonadi_export.h>
+
+#include <QtCore/QString>
+
+#include <attribute.h>
+
+namespace MailTransport {
+/**
+ * @short An Attribute to mark messages that failed to be sent.
+ *
+ * This attribute contains the error message encountered.
+ *
+ * @author Constantin Berzan <exit3219@gmail.com>
+ * @since 4.4
+ */
+class MAILTRANSPORTAKONADI_EXPORT ErrorAttribute : public Akonadi::Attribute
+{
+public:
+    /**
+     * Creates a new error attribute.
+     *
+     * @param msg The i18n'ed error message.
+     */
+    explicit ErrorAttribute(const QString &msg = QString());
+
+    /**
+     * Destroys the error attribute.
+     */
+    virtual ~ErrorAttribute();
+
+    /**
+     * Returns the i18n'ed error message.
+     */
+    QString message() const;
+
+    /**
+     * Sets the i18n'ed error message.
+     */
+    void setMessage(const QString &msg);
+
+    /* reimpl */
+    ErrorAttribute *clone() const Q_DECL_OVERRIDE;
+    QByteArray type() const Q_DECL_OVERRIDE;
+    QByteArray serialized() const Q_DECL_OVERRIDE;
+    void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+
+private:
+    //@cond PRIVATE
+    class Private;
+    Private *const d;
+    //@endcond
+};
+}
+
+#endif
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/filteractionjob.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/filteractionjob.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/filteractionjob.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/filteractionjob.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,137 @@
+/*
+  Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#include "filteractionjob_p.h"
+#include "helper_p.h"
+
+#include <collection.h>
+#include <itemfetchjob.h>
+#include <itemfetchscope.h>
+
+#include "mailtransportakonadi_debug.h"
+
+using namespace Akonadi;
+
+class Q_DECL_HIDDEN Akonadi::FilterActionJob::Private
+{
+public:
+    Private(FilterActionJob *qq)
+        : q(qq)
+        , functor(nullptr)
+    {
+    }
+
+    ~Private()
+    {
+        delete functor;
+    }
+
+    FilterActionJob *q;
+    Collection collection;
+    Item::List items;
+    FilterAction *functor;
+    ItemFetchScope fetchScope;
+
+    // Q_SLOTS:
+    void fetchResult(KJob *job);
+
+    void traverseItems();
+};
+
+void FilterActionJob::Private::fetchResult(KJob *job)
+{
+    if (job->error()) {
+        // KCompositeJob takes care of errors.
+        return;
+    }
+
+    ItemFetchJob *fjob = dynamic_cast<ItemFetchJob *>(job);
+    Q_ASSERT(fjob);
+    Q_ASSERT(items.isEmpty());
+    items = fjob->items();
+    traverseItems();
+}
+
+void FilterActionJob::Private::traverseItems()
+{
+    Q_ASSERT(functor);
+    qCDebug(MAILTRANSPORTAKONADI_LOG) << "Traversing" << items.count() << "items.";
+    for (const Item &item : qAsConst(items)) {
+        if (functor->itemAccepted(item)) {
+            functor->itemAction(item, q);
+            qCDebug(MAILTRANSPORTAKONADI_LOG) << "Added subjob for item" << item.id();
+        }
+    }
+    if (q->subjobs().isEmpty()) {
+        qCDebug(MAILTRANSPORTAKONADI_LOG) << "No subjobs; I am done";
+    } else {
+        qCDebug(MAILTRANSPORTAKONADI_LOG) << "Have subjobs; Done when last of them is";
+    }
+    q->commit();
+}
+
+FilterAction::~FilterAction()
+{
+}
+
+FilterActionJob::FilterActionJob(const Item &item, FilterAction *functor, QObject *parent)
+    : TransactionSequence(parent)
+    , d(new Private(this))
+{
+    d->functor = functor;
+    d->items << item;
+}
+
+FilterActionJob::FilterActionJob(const Item::List &items, FilterAction *functor, QObject *parent)
+    : TransactionSequence(parent)
+    , d(new Private(this))
+{
+    d->functor = functor;
+    d->items = items;
+}
+
+FilterActionJob::FilterActionJob(const Collection &collection, FilterAction *functor, QObject *parent)
+    : TransactionSequence(parent)
+    , d(new Private(this))
+{
+    d->functor = functor;
+    Q_ASSERT(collection.isValid());
+    d->collection = collection;
+}
+
+FilterActionJob::~FilterActionJob()
+{
+    delete d;
+}
+
+void FilterActionJob::doStart()
+{
+    if (d->collection.isValid()) {
+        qCDebug(MAILTRANSPORTAKONADI_LOG) << "Fetching collection" << d->collection.id();
+        ItemFetchJob *fjob = new ItemFetchJob(d->collection, this);
+        Q_ASSERT(d->functor);
+        d->fetchScope = d->functor->fetchScope();
+        fjob->setFetchScope(d->fetchScope);
+        connect(fjob, SIGNAL(result(KJob *)), this, SLOT(fetchResult(KJob *)));
+    } else {
+        d->traverseItems();
+    }
+}
+
+#include "moc_filteractionjob_p.cpp"
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/filteractionjob_p.h kmailtransport-17.04.3/src/kmailtransportakonadi/filteractionjob_p.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/filteractionjob_p.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/filteractionjob_p.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,180 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_FILTERACTIONJOB_P_H
+#define MAILTRANSPORT_FILTERACTIONJOB_P_H
+
+#include <mailtransportakonadi_export.h>
+
+#include <item.h>
+#include <transactionsequence.h>
+
+namespace Akonadi {
+class Collection;
+class ItemFetchScope;
+class Job;
+
+class FilterActionJob;
+
+/**
+ * @short Base class for a filter/action for FilterActionJob.
+ *
+ * Abstract class defining an interface for a filter and an action for
+ * FilterActionJob.  The virtual methods must be implemented in subclasses.
+ *
+ * @code
+ * class ClearErrorAction : public Akonadi::FilterAction
+ * {
+ *   public:
+ *     // reimpl
+ *     virtual Akonadi::ItemFetchScope fetchScope() const
+ *     {
+ *       ItemFetchScope scope;
+ *       scope.fetchFullPayload( false );
+ *       scope.fetchAttribute<ErrorAttribute>();
+ *       return scope;
+ *     }
+ *
+ *     virtual bool itemAccepted( const Akonadi::Item &item ) const
+ *     {
+ *       return item.hasAttribute<ErrorAttribute>();
+ *     }
+ *
+ *     virtual Akonadi::Job *itemAction( const Akonadi::Item &item,
+ *                                       Akonadi::FilterActionJob *parent ) const
+ *     {
+ *       Item cp = item;
+ *       cp.removeAttribute<ErrorAttribute>();
+ *       return new ItemModifyJob( cp, parent );
+ *     }
+ * };
+ * @endcode
+ *
+ * @see FilterActionJob
+ *
+ * @author Constantin Berzan <exit3219@gmail.com>
+ * @since 4.4
+ */
+class MAILTRANSPORTAKONADI_EXPORT FilterAction
+{
+public:
+    /**
+     * Destroys this filter action.
+     *
+     * A FilterActionJob will delete its FilterAction automatically.
+     */
+    virtual ~FilterAction();
+
+    /**
+     * Returns an ItemFetchScope to use if the FilterActionJob needs
+     * to fetch the items from a collection.
+     *
+     * @note The items are not fetched unless FilterActionJob is
+     *       constructed with a Collection parameter.
+     */
+    virtual Akonadi::ItemFetchScope fetchScope() const = 0;
+
+    /**
+     * Returns @c true if the @p item is accepted by the filter and should be
+     * acted upon by the FilterActionJob.
+     */
+    virtual bool itemAccepted(const Akonadi::Item &item) const = 0;
+
+    /**
+     * Returns a job to act on the @p item.
+     * The FilterActionJob will finish when all such jobs are finished.
+     * @param item the item to work on
+     * @param parent the parent job
+     */
+    virtual Akonadi::Job *itemAction(const Akonadi::Item &item, Akonadi::FilterActionJob *parent) const = 0;
+};
+
+/**
+ * @short Job to filter and apply an action on a set of items.
+ *
+ * This jobs filters through a set of items, and applies an action to the
+ * items which are accepted by the filter.  The filter and action
+ * are provided by a functor class derived from FilterAction.
+ *
+ * For example, a MarkAsRead action/filter may be used to mark all messages
+ * in a folder as read.
+ *
+ * @code
+ * FilterActionJob *mjob = new FilterActionJob( LocalFolders::self()->outbox(),
+ *                                              new ClearErrorAction, this );
+ * connect( mjob, SIGNAL( result( KJob* ) ), this, SLOT( massModifyResult( KJob* ) ) );
+ * @endcode
+ *
+ * @see FilterAction
+ *
+ * @author Constantin Berzan <exit3219@gmail.com>
+ * @since 4.4
+ */
+class MAILTRANSPORTAKONADI_EXPORT FilterActionJob : public TransactionSequence
+{
+    Q_OBJECT
+
+public:
+    /**
+     * Creates a filter action job to act on a single item.
+     *
+     * @param item The item to act on. The item is not re-fetched.
+     * @param functor The FilterAction to use.
+     * @param parent The parent object.
+     */
+    FilterActionJob(const Item &item, FilterAction *functor, QObject *parent = nullptr);
+
+    /**
+     * Creates a filter action job to act on a set of items.
+     *
+     * @param items The items to act on. The items are not re-fetched.
+     * @param functor The FilterAction to use.
+     * @param parent The parent object.
+     */
+    FilterActionJob(const Item::List &items, FilterAction *functor, QObject *parent = nullptr);
+
+    /**
+     * Creates a filter action job to act on items in a collection.
+     *
+     * @param collection The collection to act on.
+     *                   The items of the collection are fetched using functor->fetchScope().
+     * @param functor The FilterAction to use.
+     * @param parent The parent object.
+     */
+    FilterActionJob(const Collection &collection, FilterAction *functor, QObject *parent = nullptr);
+
+    /**
+     * Destroys the filter action job.
+     */
+    ~FilterActionJob();
+
+protected:
+    void doStart() Q_DECL_OVERRIDE;
+
+private:
+    //@cond PRIVATE
+    class Private;
+    Private *const d;
+
+    Q_PRIVATE_SLOT(d, void fetchResult(KJob *))
+    //@endcond
+};
+} // namespace Akonadi
+
+#endif // AKONADI_FILTERACTIONJOB_H
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/KF5MailTransportAkonadiConfig.cmake.in kmailtransport-17.04.3/src/kmailtransportakonadi/KF5MailTransportAkonadiConfig.cmake.in
--- kmailtransport-16.12.3/src/kmailtransportakonadi/KF5MailTransportAkonadiConfig.cmake.in	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/KF5MailTransportAkonadiConfig.cmake.in	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,10 @@
+@PACKAGE_INIT@
+
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR} ${CMAKE_MODULE_PATH})
+include(CMakeFindDependencyMacro)
+find_dependency(KF5AkonadiMime "@AKONADIMIME_LIB_VERSION@")
+find_dependency(KF5Mime "@KMIME_LIB_VERSION@")
+find_dependency(KF5MailTransport "@PIM_VERSION@")
+
+
+include("${CMAKE_CURRENT_LIST_DIR}/KF5MailTransportAkonadiTargets.cmake")
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/messagequeuejob.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/messagequeuejob.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/messagequeuejob.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/messagequeuejob.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,222 @@
+/*
+  Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#include "messagequeuejob.h"
+
+#include "transport.h"
+#include "kmailtransportakonadi/transportattribute.h"
+#include "transportmanager.h"
+
+#include "mailtransportakonadi_debug.h"
+#include <KLocalizedString>
+
+#include <collection.h>
+#include <item.h>
+#include <itemcreatejob.h>
+#include <addressattribute.h>
+#include <messageflags.h>
+#include <specialmailcollections.h>
+#include <specialmailcollectionsrequestjob.h>
+
+using namespace Akonadi;
+using namespace KMime;
+using namespace MailTransport;
+
+/**
+  @internal
+*/
+class Q_DECL_HIDDEN MailTransport::MessageQueueJob::Private
+{
+public:
+    Private(MessageQueueJob *qq)
+        : q(qq)
+    {
+        started = false;
+    }
+
+    MessageQueueJob *const q;
+
+    Message::Ptr message;
+    TransportAttribute transportAttribute;
+    DispatchModeAttribute dispatchModeAttribute;
+    SentBehaviourAttribute sentBehaviourAttribute;
+    SentActionAttribute sentActionAttribute;
+    AddressAttribute addressAttribute;
+    bool started;
+
+    /**
+      Returns true if this message has everything it needs and is ready to be
+      sent.
+    */
+    bool validate();
+
+    // slot
+    void outboxRequestResult(KJob *job);
+};
+
+bool MessageQueueJob::Private::validate()
+{
+    if (!message) {
+        q->setError(UserDefinedError);
+        q->setErrorText(i18n("Empty message."));
+        q->emitResult();
+        return false;
+    }
+
+    if ((addressAttribute.to().count() + addressAttribute.cc().count()
+         +addressAttribute.bcc().count()) == 0) {
+        q->setError(UserDefinedError);
+        q->setErrorText(i18n("Message has no recipients."));
+        q->emitResult();
+        return false;
+    }
+
+    const int transport = transportAttribute.transportId();
+    if (TransportManager::self()->transportById(transport, false) == nullptr) {
+        q->setError(UserDefinedError);
+        q->setErrorText(i18n("Message has invalid transport."));
+        q->emitResult();
+        return false;
+    }
+
+    if (sentBehaviourAttribute.sentBehaviour() == SentBehaviourAttribute::MoveToCollection
+        && !(sentBehaviourAttribute.moveToCollection().isValid())) {
+        q->setError(UserDefinedError);
+        q->setErrorText(i18n("Message has invalid sent-mail folder."));
+        q->emitResult();
+        return false;
+    } else if (sentBehaviourAttribute.sentBehaviour()
+               == SentBehaviourAttribute::MoveToDefaultSentCollection) {
+        // TODO require SpecialMailCollections::SentMail here?
+    }
+
+    return true; // all ok
+}
+
+void MessageQueueJob::Private::outboxRequestResult(KJob *job)
+{
+    Q_ASSERT(!started);
+    started = true;
+
+    if (job->error()) {
+        qCritical() << "Failed to get the Outbox folder:" << job->error() << job->errorString();
+        q->setError(job->error());
+        q->emitResult();
+        return;
+    }
+
+    if (!validate()) {
+        // The error has been set; the result has been emitted.
+        return;
+    }
+
+    SpecialMailCollectionsRequestJob *requestJob
+        = qobject_cast<SpecialMailCollectionsRequestJob *>(job);
+    if (!requestJob) {
+        return;
+    }
+
+    // Create item.
+    Item item;
+    item.setMimeType(QStringLiteral("message/rfc822"));
+    item.setPayload<Message::Ptr>(message);
+
+    // Set attributes.
+    item.addAttribute(addressAttribute.clone());
+    item.addAttribute(dispatchModeAttribute.clone());
+    item.addAttribute(sentBehaviourAttribute.clone());
+    item.addAttribute(sentActionAttribute.clone());
+    item.addAttribute(transportAttribute.clone());
+
+    Akonadi::MessageFlags::copyMessageFlags(*message, item);
+    // Set flags.
+    item.setFlag(Akonadi::MessageFlags::Queued);
+
+    // Store the item in the outbox.
+    const Collection collection = requestJob->collection();
+    Q_ASSERT(collection.isValid());
+    ItemCreateJob *cjob = new ItemCreateJob(item, collection);   // job autostarts
+    q->addSubjob(cjob);
+}
+
+MessageQueueJob::MessageQueueJob(QObject *parent)
+    : KCompositeJob(parent)
+    , d(new Private(this))
+{
+}
+
+MessageQueueJob::~MessageQueueJob()
+{
+    delete d;
+}
+
+Message::Ptr MessageQueueJob::message() const
+{
+    return d->message;
+}
+
+DispatchModeAttribute &MessageQueueJob::dispatchModeAttribute()
+{
+    return d->dispatchModeAttribute;
+}
+
+AddressAttribute &MessageQueueJob::addressAttribute()
+{
+    return d->addressAttribute;
+}
+
+TransportAttribute &MessageQueueJob::transportAttribute()
+{
+    return d->transportAttribute;
+}
+
+SentBehaviourAttribute &MessageQueueJob::sentBehaviourAttribute()
+{
+    return d->sentBehaviourAttribute;
+}
+
+SentActionAttribute &MessageQueueJob::sentActionAttribute()
+{
+    return d->sentActionAttribute;
+}
+
+void MessageQueueJob::setMessage(const Message::Ptr &message)
+{
+    d->message = message;
+}
+
+void MessageQueueJob::start()
+{
+    SpecialMailCollectionsRequestJob *rjob = new SpecialMailCollectionsRequestJob(this);
+    rjob->requestDefaultCollection(SpecialMailCollections::Outbox);
+    connect(rjob, SIGNAL(result(KJob *)), this, SLOT(outboxRequestResult(KJob *)));
+    rjob->start();
+}
+
+void MessageQueueJob::slotResult(KJob *job)
+{
+    // error handling
+    KCompositeJob::slotResult(job);
+
+    if (!error()) {
+        emitResult();
+    }
+}
+
+#include "moc_messagequeuejob.cpp"
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/messagequeuejob.h kmailtransport-17.04.3/src/kmailtransportakonadi/messagequeuejob.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/messagequeuejob.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/messagequeuejob.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,167 @@
+/*
+  Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_MESSAGEQUEUEJOB_H
+#define MAILTRANSPORT_MESSAGEQUEUEJOB_H
+
+#include <mailtransportakonadi_export.h>
+
+#include <MailTransportAkonadi/DispatchModeAttribute>
+#include <MailTransportAkonadi/SentActionAttribute>
+#include <MailTransportAkonadi/SentBehaviourAttribute>
+#include <MailTransportAkonadi/TransportAttribute>
+
+#include <QtCore/QDateTime>
+#include <QtCore/QString>
+#include <QtCore/QStringList>
+
+#include <KCompositeJob>
+
+#include <collection.h>
+#include <Akonadi/KMime/AddressAttribute>
+
+#include <kmime/kmime_message.h>
+
+namespace MailTransport {
+/**
+  @short Provides an interface for sending email.
+
+  This class takes a KMime::Message and some related info such as sender and
+  recipient addresses, and places the message in the outbox.  The mail
+  dispatcher agent will then take it from there and send it.
+
+  This is the preferred way for applications to send email.
+
+  This job requires some options to be set before being started.  Modify the
+  attributes of this job to change these options.
+
+  You need to set the transport of the transport attribute, the from address of
+  the address attribute and one of the to, cc or bcc addresses of the address
+  attribute. Also, you need to call setMessage().
+  Optionally, you can change the dispatch mode attribute or the sent behaviour
+  attribute.
+
+  Example:
+  @code
+
+  MessageQueueJob *job = new MessageQueueJob( this );
+  job->setMessage( msg ); // msg is a Message::Ptr
+  job->transportAttribute().setTransportId( TransportManager::self()->defaultTransportId() );
+  // Use the default dispatch mode.
+  // Use the default sent-behaviour.
+  job->addressAttribute().setFrom( from ); // from is a QString
+  job->addressAttribute().setTo( to ); // to is a QStringList
+  connect( job, SIGNAL(result(KJob*)), this, SLOT(jobResult(KJob*)) );
+  job->start();
+
+  @endcode
+
+  @see DispatchModeAttribute
+  @see SentActionAttribute
+  @see SentBehaviourAttribute
+  @see TransportAttribute
+  @see AddressAttribute
+
+  @author Constantin Berzan <exit3219@gmail.com>
+  @since 4.4
+*/
+class MAILTRANSPORTAKONADI_EXPORT MessageQueueJob : public KCompositeJob
+{
+    Q_OBJECT
+
+public:
+    /**
+      Creates a new MessageQueueJob.
+      @param parent the QObject parent
+      This is not an autostarting job; you need to call start() yourself.
+    */
+    explicit MessageQueueJob(QObject *parent = nullptr);
+
+    /**
+      Destroys the MessageQueueJob.
+      This job deletes itself after finishing.
+    */
+    virtual ~MessageQueueJob();
+
+    /**
+      Returns the message to be sent.
+    */
+    KMime::Message::Ptr message() const;
+
+    /**
+      Returns a reference to the dispatch mode attribue for this message.
+      Modify the returned attribute to change the dispatch mode.
+    */
+    DispatchModeAttribute &dispatchModeAttribute();
+
+    /**
+      Returns a reference to the address attribue for this message.
+      Modify the returned attribute to change the receivers or the from
+      address.
+    */
+    Akonadi::AddressAttribute &addressAttribute();
+
+    /**
+      Returns a reference to the transport attribue for this message.
+      Modify the returned attribute to change the transport used for
+      sending the mail.
+    */
+    TransportAttribute &transportAttribute();
+
+    /**
+      Returns a reference to the sent behaviour attribue for this message.
+      Modify the returned attribute to change the sent behaviour.
+    */
+    SentBehaviourAttribute &sentBehaviourAttribute();
+
+    /**
+      Returns a reference to the sent action attribue for this message.
+      Modify the returned attribute to change the sent actions.
+    */
+    SentActionAttribute &sentActionAttribute();
+
+    /**
+      Sets the message to be sent.
+    */
+    void setMessage(const KMime::Message::Ptr &message);
+
+    /**
+      Creates the item and places it in the outbox.
+      It is now queued for sending by the mail dispatcher agent.
+    */
+    void start() Q_DECL_OVERRIDE;
+
+protected Q_SLOTS:
+    /**
+      Called when the ItemCreateJob subjob finishes.
+
+      (reimplemented from KCompositeJob)
+    */
+    void slotResult(KJob *) Q_DECL_OVERRIDE;
+
+private:
+    class Private;
+    friend class Private;
+    Private *const d;
+
+    Q_PRIVATE_SLOT(d, void outboxRequestResult(KJob *))
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_MESSAGEQUEUEJOB_H
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/outboxactions.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/outboxactions.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/outboxactions.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/outboxactions.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,162 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "outboxactions_p.h"
+
+#include "mailtransportakonadi_debug.h"
+#include "kmailtransportakonadi/dispatchmodeattribute.h"
+#include "kmailtransportakonadi/errorattribute.h"
+
+#include <itemmodifyjob.h>
+#include <messageflags.h>
+
+using namespace Akonadi;
+using namespace MailTransport;
+
+class MailTransport::SendQueuedAction::Private
+{
+};
+
+SendQueuedAction::SendQueuedAction()
+    : d(new Private)
+{
+}
+
+SendQueuedAction::~SendQueuedAction()
+{
+    delete d;
+}
+
+ItemFetchScope SendQueuedAction::fetchScope() const
+{
+    ItemFetchScope scope;
+    scope.fetchFullPayload(false);
+    scope.fetchAttribute<DispatchModeAttribute>();
+    scope.fetchAttribute<ErrorAttribute>();
+    scope.setCacheOnly(true);
+    return scope;
+}
+
+bool SendQueuedAction::itemAccepted(const Item &item) const
+{
+    if (!item.hasAttribute<DispatchModeAttribute>()) {
+        qCWarning(MAILTRANSPORTAKONADI_LOG) << "Item doesn't have DispatchModeAttribute.";
+        return false;
+    }
+
+    return item.attribute<DispatchModeAttribute>()->dispatchMode() == DispatchModeAttribute::Manual;
+}
+
+Job *SendQueuedAction::itemAction(const Item &item, FilterActionJob *parent) const
+{
+    Item cp = item;
+    cp.addAttribute(new DispatchModeAttribute);   // defaults to Automatic
+    if (cp.hasAttribute<ErrorAttribute>()) {
+        cp.removeAttribute<ErrorAttribute>();
+        cp.clearFlag(Akonadi::MessageFlags::HasError);
+    }
+    return new ItemModifyJob(cp, parent);
+}
+
+class MailTransport::ClearErrorAction::Private
+{
+};
+
+ClearErrorAction::ClearErrorAction()
+    : d(new Private)
+{
+}
+
+ClearErrorAction::~ClearErrorAction()
+{
+    delete d;
+}
+
+ItemFetchScope ClearErrorAction::fetchScope() const
+{
+    ItemFetchScope scope;
+    scope.fetchFullPayload(false);
+    scope.fetchAttribute<ErrorAttribute>();
+    scope.setCacheOnly(true);
+    return scope;
+}
+
+bool ClearErrorAction::itemAccepted(const Item &item) const
+{
+    return item.hasAttribute<ErrorAttribute>();
+}
+
+Job *ClearErrorAction::itemAction(const Item &item, FilterActionJob *parent) const
+{
+    Item cp = item;
+    cp.removeAttribute<ErrorAttribute>();
+    cp.clearFlag(Akonadi::MessageFlags::HasError);
+    cp.setFlag(Akonadi::MessageFlags::Queued);
+    return new ItemModifyJob(cp, parent);
+}
+
+class MailTransport::DispatchManualTransportAction::Private
+{
+};
+
+DispatchManualTransportAction::DispatchManualTransportAction(int transportId)
+    : d(new Private)
+    , mTransportId(transportId)
+{
+}
+
+DispatchManualTransportAction::~DispatchManualTransportAction()
+{
+    delete d;
+}
+
+ItemFetchScope DispatchManualTransportAction::fetchScope() const
+{
+    ItemFetchScope scope;
+    scope.fetchFullPayload(false);
+    scope.fetchAttribute<TransportAttribute>();
+    scope.fetchAttribute<DispatchModeAttribute>();
+    scope.setCacheOnly(true);
+    return scope;
+}
+
+bool DispatchManualTransportAction::itemAccepted(const Item &item) const
+{
+    if (!item.hasAttribute<DispatchModeAttribute>()) {
+        qCWarning(MAILTRANSPORTAKONADI_LOG) << "Item doesn't have DispatchModeAttribute.";
+        return false;
+    }
+
+    if (!item.hasAttribute<TransportAttribute>()) {
+        qCWarning(MAILTRANSPORTAKONADI_LOG) << "Item doesn't have TransportAttribute.";
+        return false;
+    }
+
+    return item.attribute<DispatchModeAttribute>()->dispatchMode() == DispatchModeAttribute::Manual;
+}
+
+Job *DispatchManualTransportAction::itemAction(const Item &item, FilterActionJob *parent) const
+{
+    Item cp = item;
+    cp.attribute<TransportAttribute>()->setTransportId(mTransportId);
+    cp.removeAttribute<DispatchModeAttribute>();
+    cp.addAttribute(new DispatchModeAttribute);   // defaults to Automatic
+    cp.setFlag(Akonadi::MessageFlags::Queued);
+    return new ItemModifyJob(cp, parent);
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/outboxactions_p.h kmailtransport-17.04.3/src/kmailtransportakonadi/outboxactions_p.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/outboxactions_p.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/outboxactions_p.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,125 @@
+/*
+  Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_OUTBOXACTIONS_P_H
+#define MAILTRANSPORT_OUTBOXACTIONS_P_H
+
+#include <mailtransportakonadi_export.h>
+#include <filteractionjob_p.h>
+#include "transportattribute.h"
+
+#include <itemfetchscope.h>
+#include <job.h>
+
+namespace MailTransport {
+/**
+  FilterAction that finds all messages with a DispatchMode of Manual
+  and assigns them a DispatchMode of Immediately.
+
+  This is used to send "queued" messages on demand.
+
+  @see FilterActionJob
+
+  @author Constantin Berzan <exit3219@gmail.com>
+  @since 4.4
+*/
+class SendQueuedAction : public Akonadi::FilterAction
+{
+public:
+    /** Creates a SendQueuedAction. */
+    SendQueuedAction();
+
+    /** Destroys this object. */
+    virtual ~SendQueuedAction();
+
+    Akonadi::ItemFetchScope fetchScope() const Q_DECL_OVERRIDE;
+
+    bool itemAccepted(const Akonadi::Item &item) const Q_DECL_OVERRIDE;
+
+    Akonadi::Job *itemAction(const Akonadi::Item &item, Akonadi::FilterActionJob *parent) const Q_DECL_OVERRIDE;
+
+private:
+    class Private;
+    Private *const d;
+};
+
+/**
+  FilterAction that finds all messages with an ErrorAttribute,
+  removes the attribute, and sets the "$QUEUED" flag.
+
+  This is used to retry sending messages that failed.
+
+  @see FilterActionJob
+
+  @author Constantin Berzan <exit3219@gmail.com>
+  @since 4.4
+*/
+class ClearErrorAction : public Akonadi::FilterAction
+{
+public:
+    /** Creates a ClearErrorAction. */
+    ClearErrorAction();
+
+    /** Destroys this object. */
+    virtual ~ClearErrorAction();
+
+    Akonadi::ItemFetchScope fetchScope() const Q_DECL_OVERRIDE;
+
+    bool itemAccepted(const Akonadi::Item &item) const Q_DECL_OVERRIDE;
+
+    virtual Akonadi::Job *itemAction(const Akonadi::Item &item, Akonadi::FilterActionJob *parent) const Q_DECL_OVERRIDE;
+
+private:
+    class Private;
+    Private *const d;
+};
+
+/**
+  FilterAction that changes the transport for all messages and
+  sets the "$QUEUED" flag.
+
+  This is used to send queued messages using an alternative transport.
+
+  @see FilterActionJob
+
+  @author Torgny Nyblom <kde nyblom org>
+  @since 4.5
+*/
+class DispatchManualTransportAction : public Akonadi::FilterAction
+{
+public:
+    DispatchManualTransportAction(int transportId);
+
+    virtual ~DispatchManualTransportAction();
+
+    Akonadi::ItemFetchScope fetchScope() const Q_DECL_OVERRIDE;
+
+    bool itemAccepted(const Akonadi::Item &item) const Q_DECL_OVERRIDE;
+
+    virtual Akonadi::Job *itemAction(const Akonadi::Item &item, Akonadi::FilterActionJob *parent) const Q_DECL_OVERRIDE;
+
+private:
+    class Private;
+    Private *const d;
+
+    int mTransportId;
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_OUTBOXACTIONS_P_H
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/sentactionattribute.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/sentactionattribute.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/sentactionattribute.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/sentactionattribute.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,172 @@
+/*
+  Copyright (C) 2010 Klarälvdalens Datakonsult AB,
+      a KDAB Group company, info@kdab.net,
+      author Tobias Koenig <tokoe@kdab.com>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#include "sentactionattribute.h"
+#include "helper_p.h"
+
+#include <QtCore/QDataStream>
+#include <QtCore/QSharedData>
+
+using namespace Akonadi;
+using namespace MailTransport;
+
+class SentActionAttribute::Action::Private : public QSharedData
+{
+public:
+    Private()
+        : mType(Invalid)
+    {
+    }
+
+    Private(const Private &other)
+        : QSharedData(other)
+    {
+        mType = other.mType;
+        mValue = other.mValue;
+    }
+
+    Type mType;
+    QVariant mValue;
+};
+
+SentActionAttribute::Action::Action()
+    : d(new Private)
+{
+}
+
+SentActionAttribute::Action::Action(Type type, const QVariant &value)
+    : d(new Private)
+{
+    d->mType = type;
+    d->mValue = value;
+}
+
+SentActionAttribute::Action::Action(const Action &other)
+    : d(other.d)
+{
+}
+
+SentActionAttribute::Action::~Action()
+{
+}
+
+SentActionAttribute::Action::Type SentActionAttribute::Action::type() const
+{
+    return d->mType;
+}
+
+QVariant SentActionAttribute::Action::value() const
+{
+    return d->mValue;
+}
+
+SentActionAttribute::Action &SentActionAttribute::Action::operator=(const Action &other)
+{
+    if (this != &other) {
+        d = other.d;
+    }
+
+    return *this;
+}
+
+bool SentActionAttribute::Action::operator==(const Action &other) const
+{
+    return (d->mType == other.d->mType) && (d->mValue == other.d->mValue);
+}
+
+class SentActionAttribute::Private
+{
+public:
+    Action::List mActions;
+};
+
+SentActionAttribute::SentActionAttribute()
+    : d(new Private)
+{
+}
+
+SentActionAttribute::~SentActionAttribute()
+{
+    delete d;
+}
+
+void SentActionAttribute::addAction(Action::Type type, const QVariant &value)
+{
+    d->mActions.append(Action(type, value));
+}
+
+SentActionAttribute::Action::List SentActionAttribute::actions() const
+{
+    return d->mActions;
+}
+
+SentActionAttribute *SentActionAttribute::clone() const
+{
+    SentActionAttribute *attribute = new SentActionAttribute;
+    attribute->d->mActions = d->mActions;
+
+    return attribute;
+}
+
+QByteArray SentActionAttribute::type() const
+{
+    static const QByteArray sType("SentActionAttribute");
+    return sType;
+}
+
+QByteArray SentActionAttribute::serialized() const
+{
+    QVariantList list;
+    list.reserve(d->mActions.count());
+    for (const Action &action : qAsConst(d->mActions)) {
+        QVariantMap map;
+        map.insert(QString::number(action.type()), action.value());
+
+        list << QVariant(map);
+    }
+
+    QByteArray data;
+    QDataStream stream(&data, QIODevice::WriteOnly);
+    stream.setVersion(QDataStream::Qt_4_6);
+    stream << list;
+
+    return data;
+}
+
+void SentActionAttribute::deserialize(const QByteArray &data)
+{
+    d->mActions.clear();
+
+    QDataStream stream(data);
+    stream.setVersion(QDataStream::Qt_4_6);
+
+    QVariantList list;
+    stream >> list;
+
+    for (const QVariant &variant : qAsConst(list)) {
+        const QVariantMap map = variant.toMap();
+        QMap<QString, QVariant>::const_iterator it = map.cbegin();
+        const QMap<QString, QVariant>::const_iterator itEnd = map.cend();
+        for (; it != itEnd; ++it) {
+            d->mActions << Action(static_cast<Action::Type>(it.key().toInt()), it.value());
+        }
+    }
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/sentactionattribute.h kmailtransport-17.04.3/src/kmailtransportakonadi/sentactionattribute.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/sentactionattribute.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/sentactionattribute.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,153 @@
+/*
+  Copyright (C) 2010 Klarälvdalens Datakonsult AB,
+      a KDAB Group company, info@kdab.net,
+      author Tobias Koenig <tokoe@kdab.com>
+
+  This library is free software; you can redistribute it and/or modify it
+  under the terms of the GNU Library General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+  This library is distributed in the hope that it will be useful, but WITHOUT
+  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+  License for more details.
+
+  You should have received a copy of the GNU Library General Public License
+  along with this library; see the file COPYING.LIB.  If not, write to the
+  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+  02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_SENTACTIONATTRIBUTE_H
+#define MAILTRANSPORT_SENTACTIONATTRIBUTE_H
+
+#include <mailtransportakonadi_export.h>
+
+#include <QtCore/QSharedDataPointer>
+#include <QtCore/QVariant>
+#include <QtCore/QVector>
+#include <attribute.h>
+
+namespace MailTransport {
+/**
+ * @short An Attribute that stores the action to execute after sending.
+ *
+ * This attribute stores the action that will be executed by the mail dispatcher
+ * after a mail has successfully be sent.
+ *
+ * @author Tobias Koenig <tokoe@kdab.com>
+ * @since 4.6
+ */
+class MAILTRANSPORTAKONADI_EXPORT SentActionAttribute : public Akonadi::Attribute
+{
+public:
+    /**
+     * @short A sent action.
+     */
+    class MAILTRANSPORTAKONADI_EXPORT Action
+    {
+    public:
+        /**
+         * Describes the action type.
+         */
+        enum Type {
+            Invalid,         ///< An invalid action.
+            MarkAsReplied,   ///< The message will be marked as replied.
+            MarkAsForwarded  ///< The message will be marked as forwarded.
+        };
+
+        /**
+         * Describes a list of sent actions.
+         */
+        typedef QVector<Action> List;
+
+        /**
+         * Creates a new invalid action.
+         */
+        Action();
+
+        /**
+         * Creates a new action.
+         *
+         * @param action The action that shall be executed.
+         * @param value The action specific argument.
+         */
+        Action(Type type, const QVariant &value);
+
+        /**
+         * Creates an action from an @p other action.
+         */
+        Action(const Action &other);
+
+        /**
+         * Destroys the action.
+         */
+        ~Action();
+
+        /**
+         * Returns the type of the action.
+         */
+        Type type() const;
+
+        /**
+         * Returns the argument value of the action.
+         */
+        QVariant value() const;
+
+        /**
+         * @internal
+         */
+        Action &operator=(const Action &other);
+
+        /**
+         * @internal
+         */
+        bool operator==(const Action &other) const;
+
+    private:
+        //@cond PRIVATE
+        class Private;
+        QSharedDataPointer<Private> d;
+        //@endcond
+    };
+
+    /**
+     * Creates a new sent action attribute.
+     */
+    explicit SentActionAttribute();
+
+    /**
+     * Destroys the sent action attribute.
+     */
+    virtual ~SentActionAttribute();
+
+    /**
+     * Adds a new action to the attribute.
+     *
+     * @param type The type of the action that shall be executed.
+     * @param value The action specific argument.
+     */
+    void addAction(Action::Type type, const QVariant &value);
+
+    /**
+     * Returns the list of actions.
+     */
+    Action::List actions() const;
+
+    /* reimpl */
+    SentActionAttribute *clone() const Q_DECL_OVERRIDE;
+    QByteArray type() const Q_DECL_OVERRIDE;
+    QByteArray serialized() const Q_DECL_OVERRIDE;
+    void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+
+private:
+    //@cond PRIVATE
+    class Private;
+    Private *const d;
+    //@endcond
+};
+}
+Q_DECLARE_TYPEINFO(MailTransport::SentActionAttribute::Action, Q_MOVABLE_TYPE);
+
+#endif
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/sentbehaviourattribute.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/sentbehaviourattribute.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/sentbehaviourattribute.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/sentbehaviourattribute.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,135 @@
+/*
+    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "sentbehaviourattribute.h"
+
+using namespace Akonadi;
+using namespace MailTransport;
+
+class SentBehaviourAttribute::Private
+{
+public:
+    SentBehaviourAttribute::SentBehaviour mBehaviour;
+    Akonadi::Collection mMoveToCollection;
+    bool mSilent;
+};
+
+SentBehaviourAttribute::SentBehaviourAttribute(SentBehaviour beh, const Collection &moveToCollection, bool sendSilently)
+    : d(new Private)
+{
+    d->mBehaviour = beh;
+    d->mMoveToCollection = moveToCollection;
+    d->mSilent = sendSilently;
+}
+
+SentBehaviourAttribute::~SentBehaviourAttribute()
+{
+    delete d;
+}
+
+SentBehaviourAttribute *SentBehaviourAttribute::clone() const
+{
+    return new SentBehaviourAttribute(d->mBehaviour, d->mMoveToCollection, d->mSilent);
+}
+
+QByteArray SentBehaviourAttribute::type() const
+{
+    static const QByteArray sType("SentBehaviourAttribute");
+    return sType;
+}
+
+QByteArray SentBehaviourAttribute::serialized() const
+{
+    QByteArray out;
+
+    switch (d->mBehaviour) {
+    case Delete:
+        out = "delete";
+        break;
+    case MoveToCollection:
+        out = "moveTo" + QByteArray::number(d->mMoveToCollection.id());
+        break;
+    case MoveToDefaultSentCollection:
+        out = "moveToDefault";
+        break;
+    default:
+        Q_ASSERT(false);
+        return QByteArray();
+    }
+
+    if (d->mSilent) {
+        out += ",silent";
+    }
+
+    return out;
+}
+
+void SentBehaviourAttribute::deserialize(const QByteArray &data)
+{
+    const QByteArrayList in = data.split(',');
+    Q_ASSERT(in.size() > 0);
+
+    const QByteArray attr0 = in[0];
+    d->mMoveToCollection = Akonadi::Collection(-1);
+    if (attr0 == "delete") {
+        d->mBehaviour = Delete;
+    } else if (attr0 == "moveToDefault") {
+        d->mBehaviour = MoveToDefaultSentCollection;
+    } else if (attr0.startsWith(QByteArray("moveTo"))) {
+        d->mBehaviour = MoveToCollection;
+        d->mMoveToCollection = Akonadi::Collection(attr0.mid(6).toLongLong());
+        // NOTE: 6 is the strlen of "moveTo".
+    } else {
+        Q_ASSERT(false);
+    }
+
+    if (in.size() == 2 && in[1] == "silent") {
+        d->mSilent = true;
+    }
+}
+
+SentBehaviourAttribute::SentBehaviour SentBehaviourAttribute::sentBehaviour() const
+{
+    return d->mBehaviour;
+}
+
+void SentBehaviourAttribute::setSentBehaviour(SentBehaviour beh)
+{
+    d->mBehaviour = beh;
+}
+
+Collection SentBehaviourAttribute::moveToCollection() const
+{
+    return d->mMoveToCollection;
+}
+
+void SentBehaviourAttribute::setMoveToCollection(const Collection &moveToCollection)
+{
+    d->mMoveToCollection = moveToCollection;
+}
+
+bool SentBehaviourAttribute::sendSilently() const
+{
+    return d->mSilent;
+}
+
+void SentBehaviourAttribute::setSendSilently(bool sendSilently)
+{
+    d->mSilent = sendSilently;
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/sentbehaviourattribute.h kmailtransport-17.04.3/src/kmailtransportakonadi/sentbehaviourattribute.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/sentbehaviourattribute.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/sentbehaviourattribute.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,112 @@
+/*
+    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_SENTBEHAVIOURATTRIBUTE_H
+#define MAILTRANSPORT_SENTBEHAVIOURATTRIBUTE_H
+
+#include <mailtransportakonadi_export.h>
+
+#include <attribute.h>
+#include <collection.h>
+
+namespace MailTransport {
+/**
+  Attribute determining what will happen to a message after it is sent.  The
+  message can be deleted from the Outbox, moved to the default sent-mail
+  collection, or moved to a custom collection.
+
+  @author Constantin Berzan <exit3219@gmail.com>
+  @since 4.4
+*/
+class MAILTRANSPORTAKONADI_EXPORT SentBehaviourAttribute : public Akonadi::Attribute
+{
+public:
+    /**
+      What to do with the item in the outbox after it has been sent successfully.
+    */
+    enum SentBehaviour {
+        Delete,                      ///< Delete the item from the outbox.
+        MoveToCollection,            ///< Move the item to a custom collection.
+        MoveToDefaultSentCollection  ///< Move the item to the default sent-mail collection.
+    };
+
+    /**
+      Creates a new SentBehaviourAttribute.
+    */
+    explicit SentBehaviourAttribute(SentBehaviour beh = MoveToDefaultSentCollection, const Akonadi::Collection &moveToCollection = Akonadi::Collection(-1), bool sendSilently = false);
+
+    /**
+      Destroys the SentBehaviourAttribute.
+    */
+    virtual ~SentBehaviourAttribute();
+
+    /* reimpl */
+    SentBehaviourAttribute *clone() const Q_DECL_OVERRIDE;
+    QByteArray type() const Q_DECL_OVERRIDE;
+    QByteArray serialized() const Q_DECL_OVERRIDE;
+    void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+
+    /**
+      Returns the sent-behaviour of the message.
+      @see SentBehaviour.
+    */
+    SentBehaviour sentBehaviour() const;
+
+    /**
+      Sets the sent-behaviour of the message.
+      @param beh the sent-behaviour to set
+      @see SentBehaviour.
+    */
+    void setSentBehaviour(SentBehaviour beh);
+
+    /**
+      Returns the collection to which the item should be moved after it is sent.
+      Only valid if sentBehaviour() is MoveToCollection.
+    */
+    Akonadi::Collection moveToCollection() const;
+
+    /**
+      Sets the collection to which the item should be moved after it is sent.
+      Make sure you set the SentBehaviour to MoveToCollection first.
+      @param moveToCollection target collection for "move to" operation
+      @see setSentBehaviour.
+    */
+    void setMoveToCollection(const Akonadi::Collection &moveToCollection);
+
+    /**
+     * Returns whether a notification should be shown after the email is sent.
+     * @since 5.4
+     */
+    bool sendSilently() const;
+
+    /**
+     * Set whether a notification should be shown after the email is sent.
+     *
+     * Default is false.
+     *
+     * @since 5.4
+     */
+    void setSendSilently(bool sendSilently);
+private:
+    class Private;
+    Private *const d;
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_SENTBEHAVIOURATTRIBUTE_H
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/tests/abort.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/tests/abort.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/tests/abort.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/tests/abort.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,62 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "abort.h"
+
+#include <QTimer>
+
+#include <QApplication>
+#include <QDebug>
+
+#include <control.h>
+
+#include <kmailtransportakonadi/dispatcherinterface.h>
+
+using namespace Akonadi;
+using namespace MailTransport;
+
+Runner::Runner()
+{
+    Control::start();
+
+    QTimer::singleShot(0, this, SLOT(sendAbort()));
+}
+
+void Runner::sendAbort()
+{
+    const AgentInstance mda = DispatcherInterface().dispatcherInstance();
+    if (!mda.isValid()) {
+        qDebug() << "Invalid instance; waiting.";
+        QTimer::singleShot(1000, this, SLOT(sendAbort()));
+        return;
+    }
+
+    mda.abortCurrentTask();
+    qDebug() << "Told the MDA to abort.";
+    QApplication::exit(0);
+}
+
+int main(int argc, char **argv)
+{
+    QApplication::setApplicationName(QStringLiteral("Abort"));
+    QApplication app(argc, argv);
+
+    new Runner();
+    return app.exec();
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/tests/abort.h kmailtransport-17.04.3/src/kmailtransportakonadi/tests/abort.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/tests/abort.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/tests/abort.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,39 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef ABORT_H
+#define ABORT_H
+
+#include <QObject>
+
+/**
+  This class uses the DispatcherInterface to send an abort() signal th the MDA.
+*/
+class Runner : public QObject
+{
+    Q_OBJECT
+
+public:
+    Runner();
+
+private Q_SLOTS:
+    void sendAbort();
+};
+
+#endif
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/tests/clearerror.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/tests/clearerror.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/tests/clearerror.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/tests/clearerror.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,56 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "clearerror.h"
+
+#include <QApplication>
+
+#include <collection.h>
+#include <control.h>
+#include <filteractionjob_p.h>
+#include <kmailtransportakonadi/dispatcherinterface.h>
+#include <specialmailcollections.h>
+#include <specialmailcollectionsrequestjob.h>
+
+using namespace Akonadi;
+using namespace MailTransport;
+
+Runner::Runner()
+{
+    Control::start();
+
+    SpecialMailCollectionsRequestJob *rjob = new SpecialMailCollectionsRequestJob(this);
+    rjob->requestDefaultCollection(SpecialMailCollections::Outbox);
+    connect(rjob, &SpecialMailCollectionsRequestJob::result, this, &Runner::checkFolders);
+    rjob->start();
+}
+
+void Runner::checkFolders()
+{
+    DispatcherInterface().retryDispatching();
+}
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    app.setApplicationName(QStringLiteral("clearerror"));
+
+    new Runner();
+    return app.exec();
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/tests/clearerror.h kmailtransport-17.04.3/src/kmailtransportakonadi/tests/clearerror.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/tests/clearerror.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/tests/clearerror.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef CLEARERROR_H
+#define CLEARERROR_H
+
+#include <QObject>
+
+/**
+  This class uses the ClearErrorAction to mark all failed messages in the
+  outbox for immediate sending.
+*/
+class Runner : public QObject
+{
+    Q_OBJECT
+
+public:
+    Runner();
+
+private Q_SLOTS:
+    void checkFolders();
+};
+
+#endif
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/tests/CMakeLists.txt kmailtransport-17.04.3/src/kmailtransportakonadi/tests/CMakeLists.txt
--- kmailtransport-16.12.3/src/kmailtransportakonadi/tests/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/tests/CMakeLists.txt	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,26 @@
+
+include(ECMMarkAsTest)
+
+find_package(KF5TextWidgets ${KF5_VERSION} CONFIG REQUIRED)
+find_package(Qt5Test CONFIG REQUIRED)
+
+set(queuer_srcs queuer.cpp)
+add_executable(queuer ${queuer_srcs})
+ecm_mark_as_test(queuer)
+target_link_libraries(queuer KF5MailTransportAkonadi Qt5::Widgets KF5::I18n KF5::ConfigGui KF5::Completion KF5::TextWidgets)
+
+set( sendqueued_srcs sendqueued.cpp )
+add_executable( sendqueued ${sendqueued_srcs} )
+ecm_mark_as_test(sendqueued)
+target_link_libraries( sendqueued KF5MailTransportAkonadi  KF5::AkonadiMime Qt5::Widgets)
+
+set( clearerror_srcs clearerror.cpp )
+add_executable( clearerror ${clearerror_srcs} )
+ecm_mark_as_test(clearerror)
+target_link_libraries( clearerror KF5MailTransportAkonadi  KF5::AkonadiMime Qt5::Widgets)
+
+set( abort_srcs abort.cpp )
+add_executable( abort ${abort_srcs} )
+ecm_mark_as_test(abort)
+target_link_libraries( abort KF5MailTransportAkonadi KF5::AkonadiCore Qt5::Widgets)
+
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/tests/queuer.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/tests/queuer.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/tests/queuer.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/tests/queuer.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,187 @@
+/*
+    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "queuer.h"
+
+#include <QDateTime>
+#include <QPointer>
+#include <QPushButton>
+
+#include <QApplication>
+#include <QDateTimeEdit>
+#include <QLineEdit>
+#include <KTextEdit>
+#include <QVBoxLayout>
+#include <control.h>
+
+#include <QDebug>
+#include <QDialog>
+#include <QDialogButtonBox>
+
+#include <kmailtransportakonadi/dispatchmodeattribute.h>
+#include <kmailtransportakonadi/messagequeuejob.h>
+#include <transportmanager.h>
+#include <transport.h>
+
+using namespace KMime;
+using namespace MailTransport;
+
+MessageQueuer::MessageQueuer()
+{
+    if (!Akonadi::Control::start()) {
+        qFatal("Could not start Akonadi server.");
+    }
+    QVBoxLayout *vbox = new QVBoxLayout;
+    vbox->setMargin(0);
+    setLayout(vbox);
+
+    mComboBox = new TransportComboBox(this);
+    mComboBox->setEditable(true);
+    vbox->addWidget(mComboBox);
+    mSenderEdit = new QLineEdit(this);
+    mSenderEdit->setPlaceholderText(QStringLiteral("Sender"));
+    vbox->addWidget(mSenderEdit);
+    mToEdit = new QLineEdit(this);
+    mToEdit->setText(QStringLiteral("idanoka@gmail.com"));
+    vbox->addWidget(mToEdit);
+    mToEdit->setPlaceholderText(QStringLiteral("To"));
+    mCcEdit = new QLineEdit(this);
+    vbox->addWidget(mCcEdit);
+    mCcEdit->setPlaceholderText(QStringLiteral("Cc"));
+    mBccEdit = new QLineEdit(this);
+    mBccEdit->setPlaceholderText(QStringLiteral("Bcc"));
+    vbox->addWidget(mBccEdit);
+    mMailEdit = new KTextEdit(this);
+    mMailEdit->setText(QStringLiteral("test from queuer!"));
+    mMailEdit->setAcceptRichText(false);
+    mMailEdit->setLineWrapMode(QTextEdit::NoWrap);
+    vbox->addWidget(mMailEdit);
+    QPushButton *b = new QPushButton(QStringLiteral("&Send Now"), this);
+    vbox->addWidget(b);
+    connect(b, &QPushButton::clicked, this, &MessageQueuer::sendNowClicked);
+    b = new QPushButton(QStringLiteral("Send &Queued"), this);
+    vbox->addWidget(b);
+    connect(b, &QPushButton::clicked, this, &MessageQueuer::sendQueuedClicked);
+    b = new QPushButton(QStringLiteral("Send on &Date..."), this);
+    vbox->addWidget(b);
+    connect(b, &QPushButton::clicked, this, &MessageQueuer::sendOnDateClicked);
+}
+
+void MessageQueuer::sendNowClicked()
+{
+    MessageQueueJob *qjob = createQueueJob();
+    qDebug() << "DispatchMode default (Automatic).";
+    qjob->start();
+}
+
+void MessageQueuer::sendQueuedClicked()
+{
+    MessageQueueJob *qjob = createQueueJob();
+    qDebug() << "DispatchMode Manual.";
+    qjob->dispatchModeAttribute().setDispatchMode(DispatchModeAttribute::Manual);
+    qjob->start();
+}
+
+void MessageQueuer::sendOnDateClicked()
+{
+    QPointer<QDialog> dialog = new QDialog(this);
+    auto layout = new QVBoxLayout(dialog);
+    QDateTimeEdit *dt = new QDateTimeEdit(dialog);
+    dt->setDateTime(QDateTime::currentDateTime());
+    dt->setDisplayFormat(QStringLiteral("hh:mm:ss"));
+    layout->addWidget(dt);
+    auto box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
+    connect(box, SIGNAL(accepted()), dialog, SLOT(accept()));
+    connect(box, SIGNAL(rejected()), dialog, SLOT(reject()));
+    layout->addWidget(box);
+    if (!dialog->exec() || !dialog) {
+        return;
+    }
+    qDebug() << "DispatchMode AfterDueDate" << dt->dateTime();
+    MessageQueueJob *qjob = createQueueJob();
+    qjob->dispatchModeAttribute().setDispatchMode(DispatchModeAttribute::Automatic);
+    qjob->dispatchModeAttribute().setSendAfter(dt->dateTime());
+    qjob->start();
+    delete dialog;
+}
+
+MessageQueueJob *MessageQueuer::createQueueJob()
+{
+    Message::Ptr msg = Message::Ptr(new Message);
+    // No headers; need a '\n' to separate headers from body.
+    // TODO: use real headers
+    msg->setContent(QByteArray("\n") + mMailEdit->document()->toPlainText().toLatin1());
+    qDebug() << "msg:" << msg->encodedContent(true);
+
+    MessageQueueJob *job = new MessageQueueJob();
+    job->setMessage(msg);
+    job->transportAttribute().setTransportId(mComboBox->currentTransportId());
+    // default dispatch mode
+    // default sent-mail collection
+    job->addressAttribute().setFrom(mSenderEdit->text());
+    job->addressAttribute().setTo(mToEdit->text().isEmpty()
+                                  ? QStringList() : mToEdit->text().split(QLatin1Char(',')));
+    job->addressAttribute().setCc(mCcEdit->text().isEmpty()
+                                  ? QStringList() : mCcEdit->text().split(QLatin1Char(',')));
+    job->addressAttribute().setBcc(mBccEdit->text().isEmpty()
+                                   ? QStringList() : mBccEdit->text().split(QLatin1Char(',')));
+
+    connect(job, SIGNAL(result(KJob *)),
+            SLOT(jobResult(KJob *)));
+    connect(job, SIGNAL(percent(KJob *,ulong)),
+            SLOT(jobPercent(KJob *,ulong)));
+    connect(job, SIGNAL(infoMessage(KJob *,QString,QString)),
+            SLOT(jobInfoMessage(KJob *,QString,QString)));
+
+    return job;
+}
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    app.setApplicationName(QStringLiteral("messagequeuer"));
+
+    MessageQueuer *t = new MessageQueuer();
+    t->show();
+    app.exec();
+    delete t;
+}
+
+void MessageQueuer::jobResult(KJob *job)
+{
+    if (job->error()) {
+        qDebug() << "job error:" << job->errorText();
+    } else {
+        qDebug() << "job success.";
+    }
+}
+
+void MessageQueuer::jobPercent(KJob *job, unsigned long percent)
+{
+    Q_UNUSED(job);
+    qDebug() << percent << "%";
+}
+
+void MessageQueuer::jobInfoMessage(KJob *job, const QString &info, const QString &info2)
+{
+    Q_UNUSED(job);
+    qDebug() << info;
+    qDebug() << info2;
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/tests/queuer.h kmailtransport-17.04.3/src/kmailtransportakonadi/tests/queuer.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/tests/queuer.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/tests/queuer.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,61 @@
+/*
+    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MESSAGEQUEUER_H
+#define MESSAGEQUEUER_H
+
+#include <QWidget>
+#include <widgets/transportcombobox.h>
+
+class KJob;
+class QLineEdit;
+class KTextEdit;
+
+namespace MailTransport {
+class MessageQueueJob;
+}
+
+/**
+  Mostly stolen from transportmgr.{h,cpp}
+*/
+class MessageQueuer : public QWidget
+{
+    Q_OBJECT
+
+public:
+    MessageQueuer();
+
+private Q_SLOTS:
+    void sendNowClicked();
+    void sendQueuedClicked();
+    void sendOnDateClicked();
+    void jobResult(KJob *job);
+    void jobPercent(KJob *job, unsigned long percent);
+    void jobInfoMessage(KJob *job, const QString &info, const QString &info2);
+
+private:
+    MailTransport::TransportComboBox *mComboBox;
+    QLineEdit *mSenderEdit, *mToEdit, *mCcEdit, *mBccEdit;
+    KTextEdit *mMailEdit;
+
+    MailTransport::MessageQueueJob *createQueueJob();
+};
+
+#endif
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/tests/sendqueued.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/tests/sendqueued.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/tests/sendqueued.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/tests/sendqueued.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,56 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "sendqueued.h"
+
+#include <QApplication>
+
+#include <collection.h>
+#include <control.h>
+#include <filteractionjob_p.h>
+#include <kmailtransportakonadi/dispatcherinterface.h>
+#include <specialmailcollections.h>
+#include <specialmailcollectionsrequestjob.h>
+
+using namespace Akonadi;
+using namespace MailTransport;
+
+Runner::Runner()
+{
+    Control::start();
+
+    SpecialMailCollectionsRequestJob *rjob = new SpecialMailCollectionsRequestJob(this);
+    rjob->requestDefaultCollection(SpecialMailCollections::Outbox);
+    connect(rjob, &SpecialMailCollectionsRequestJob::result, this, &Runner::checkFolders);
+    rjob->start();
+}
+
+void Runner::checkFolders()
+{
+    DispatcherInterface().dispatchManually();
+}
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+    app.setApplicationName(QStringLiteral("sendqueued"));
+
+    new Runner();
+    return app.exec();
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/tests/sendqueued.h kmailtransport-17.04.3/src/kmailtransportakonadi/tests/sendqueued.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/tests/sendqueued.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/tests/sendqueued.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,40 @@
+/*
+    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef SENDQUEUED_H
+#define SENDQUEUED_H
+
+#include <QObject>
+
+/**
+  This class uses the SendQueuedAction to mark all queued messages in the
+  outbox for immediate sending.
+*/
+class Runner : public QObject
+{
+    Q_OBJECT
+
+public:
+    Runner();
+
+private Q_SLOTS:
+    void checkFolders();
+};
+
+#endif
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/transportattribute.cpp kmailtransport-17.04.3/src/kmailtransportakonadi/transportattribute.cpp
--- kmailtransport-16.12.3/src/kmailtransportakonadi/transportattribute.cpp	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/transportattribute.cpp	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,78 @@
+/*
+    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#include "transportattribute.h"
+
+#include "transportmanager.h"
+
+using namespace Akonadi;
+using namespace MailTransport;
+
+class TransportAttribute::Private
+{
+public:
+    int mId;
+};
+
+TransportAttribute::TransportAttribute(int id)
+    : d(new Private)
+{
+    d->mId = id;
+}
+
+TransportAttribute::~TransportAttribute()
+{
+    delete d;
+}
+
+TransportAttribute *TransportAttribute::clone() const
+{
+    return new TransportAttribute(d->mId);
+}
+
+QByteArray TransportAttribute::type() const
+{
+    static const QByteArray sType("TransportAttribute");
+    return sType;
+}
+
+QByteArray TransportAttribute::serialized() const
+{
+    return QByteArray::number(d->mId);
+}
+
+void TransportAttribute::deserialize(const QByteArray &data)
+{
+    d->mId = data.toInt();
+}
+
+int TransportAttribute::transportId() const
+{
+    return d->mId;
+}
+
+Transport *TransportAttribute::transport() const
+{
+    return TransportManager::self()->transportById(d->mId, false);
+}
+
+void TransportAttribute::setTransportId(int id)
+{
+    d->mId = id;
+}
diff -Nru kmailtransport-16.12.3/src/kmailtransportakonadi/transportattribute.h kmailtransport-17.04.3/src/kmailtransportakonadi/transportattribute.h
--- kmailtransport-16.12.3/src/kmailtransportakonadi/transportattribute.h	1970-01-01 00:00:00.000000000 +0000
+++ kmailtransport-17.04.3/src/kmailtransportakonadi/transportattribute.h	2017-06-19 05:09:24.000000000 +0000
@@ -0,0 +1,81 @@
+/*
+    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
+
+    This library is free software; you can redistribute it and/or modify it
+    under the terms of the GNU Library General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or (at your
+    option) any later version.
+
+    This library is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
+    License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this library; see the file COPYING.LIB.  If not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+    02110-1301, USA.
+*/
+
+#ifndef MAILTRANSPORT_TRANSPORTATTRIBUTE_H
+#define MAILTRANSPORT_TRANSPORTATTRIBUTE_H
+
+#include <mailtransportakonadi_export.h>
+
+#include <attribute.h>
+
+namespace MailTransport {
+class Transport;
+
+/**
+  Attribute determining which transport to use for sending a message.
+
+  @see mailtransport
+  @see TransportManager.
+
+  @author Constantin Berzan <exit3219@gmail.com>
+  @since 4.4
+*/
+class MAILTRANSPORTAKONADI_EXPORT TransportAttribute : public Akonadi::Attribute
+{
+public:
+    /**
+      Creates a new TransportAttribute.
+    */
+    explicit TransportAttribute(int id = -1);
+
+    /**
+      Destroys this TransportAttribute.
+    */
+    virtual ~TransportAttribute();
+
+    /* reimpl */
+    TransportAttribute *clone() const Q_DECL_OVERRIDE;
+    QByteArray type() const Q_DECL_OVERRIDE;
+    QByteArray serialized() const Q_DECL_OVERRIDE;
+    void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
+
+    /**
+      Returns the transport id to use for sending this message.
+      @see TransportManager.
+    */
+    int transportId() const;
+
+    /**
+      Returns the transport object corresponding to the transport id contained
+      in this attribute.
+      @see Transport.
+    */
+    Transport *transport() const;
+    /**
+      Sets the transport id to use for sending this message.
+    */
+    void setTransportId(int id);
+
+private:
+    class Private;
+    Private *const d;
+};
+} // namespace MailTransport
+
+#endif // MAILTRANSPORT_TRANSPORTATTRIBUTE_H
diff -Nru kmailtransport-16.12.3/src/legacydecrypt.cpp kmailtransport-17.04.3/src/legacydecrypt.cpp
--- kmailtransport-16.12.3/src/legacydecrypt.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/legacydecrypt.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/*
-    Copyright (c) 2007 Volker Krause <vkrause@kde.org>
-
-    KNode code:
-    Copyright (c) 1999-2005 the KNode authors. // krazy:exclude=copyright
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "legacydecrypt.h"
-
-#include <KStringHandler>
-
-using namespace MailTransport;
-
-QString Legacy::decryptKMail(const QString &data)
-{
-    return KStringHandler::obscure(data);
-}
-
-QString Legacy::decryptKNode(const QString &data)
-{
-    uint i, val, len = data.length();
-    QString result;
-
-    for (i = 0; i < len; ++i) {
-        val = data[i].toLatin1();
-        val -= ' ';
-        val = (255 - ' ') - val;
-        result += QLatin1Char((char)(val + ' '));
-    }
-
-    return result;
-}
diff -Nru kmailtransport-16.12.3/src/legacydecrypt.h kmailtransport-17.04.3/src/legacydecrypt.h
--- kmailtransport-16.12.3/src/legacydecrypt.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/legacydecrypt.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,50 +0,0 @@
-/*
-    Copyright (c) 2007 Volker Krause <vkrause@kde.org>
-
-    KNode code:
-    Copyright (c) 1999-2005 the KNode authors. // krazy:exclude=copyright
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_LEGACYDECRYPT_H
-#define MAILTRANSPORT_LEGACYDECRYPT_H
-
-#include <QtCore/QString>
-
-namespace MailTransport
-{
-
-/**
-  Methods to read passwords from config files still using legacy encryption.
-*/
-class Legacy
-{
-public:
-    /**
-      Read data encrypted using KMail's legacy encryption.
-    */
-    static QString decryptKMail(const QString &data);
-
-    /**
-      Read data encrypted using KNode's legacy encryption.
-    */
-    static QString decryptKNode(const QString &data);
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_LEGACYDECRYPT_H
diff -Nru kmailtransport-16.12.3/src/mailtransport_defs.h kmailtransport-17.04.3/src/mailtransport_defs.h
--- kmailtransport-16.12.3/src/mailtransport_defs.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/mailtransport_defs.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/*
-    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_MAILTRANSPORT_DEFS_H
-#define MAILTRANSPORT_MAILTRANSPORT_DEFS_H
-
-/**
-  @file mailtransport_defs.h
-  Internal file containing constant definitions etc.
-*/
-
-#define WALLET_FOLDER QStringLiteral("mailtransports")
-#define KMAIL_WALLET_FOLDER QStringLiteral("kmail")
-
-#define DBUS_SERVICE_NAME QStringLiteral("org.kde.pim.TransportManager")
-#define DBUS_INTERFACE_NAME QStringLiteral("org.kde.pim.TransportManager")
-#define DBUS_OBJECT_PATH QStringLiteral("/TransportManager")
-#define DBUS_CHANGE_SIGNAL QStringLiteral("changesCommitted")
-
-#define SMTP_PROTOCOL QStringLiteral("smtp")
-#define SMTPS_PROTOCOL QStringLiteral("smtps")
-
-#define SMTP_PORT 25
-#define SMTPS_PORT 465
-
-// Because ServerTest is also capable of testing IMAP,
-// some additional defines:
-
-#define IMAP_PROTOCOL QStringLiteral("imap")
-#define IMAPS_PROTOCOL QStringLiteral("imaps")
-
-#define POP_PROTOCOL QStringLiteral("pop")
-#define POPS_PROTOCOL QStringLiteral("pops")
-
-#define IMAP_PORT 143
-#define IMAPS_PORT 993
-
-#define POP_PORT 110
-#define POPS_PORT 995
-
-#endif
diff -Nru kmailtransport-16.12.3/src/mailtransport.kcfg kmailtransport-17.04.3/src/mailtransport.kcfg
--- kmailtransport-16.12.3/src/mailtransport.kcfg	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/mailtransport.kcfg	1970-01-01 00:00:00.000000000 +0000
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<kcfg xmlns="http://www.kde.org/standards/kcfg/1.0"
-      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-      xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
-      http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
-  <kcfgfile name="mailtransports">
-    <parameter name="transportId" />
-  </kcfgfile>
-
-  <group name="Transport $(transportId)">
-    <entry name="id" type="Int">
-      <label>Unique identifier</label>
-      <default>0</default>
-    </entry>
-    <entry name="name" type="String">
-      <label>User-visible transport name</label>
-      <whatsthis>The name that will be used when referring to this server.</whatsthis>
-      <default code="true">i18n("Unnamed")</default>
-    </entry>
-    <entry name="type" type="Enum">
-      <choices>
-        <choice name="SMTP">
-          <label>SMTP Server</label>
-        </choice>
-        <choice name="Akonadi">
-          <label>Akonadi Resource</label>
-        </choice>
-      </choices>
-      <label>Transport type</label>
-      <default>SMTP</default>
-    </entry>
-    <entry name="host" type="String">
-      <label>Host name of the server</label>
-      <whatsthis>The domain name or numerical address of the SMTP server.</whatsthis>
-    </entry>
-    <entry name="port" type="UInt">
-      <label>Port number of the server</label>
-      <whatsthis>The port number that the SMTP server is listening on. The default port is 25.</whatsthis>
-      <default>25</default>
-    </entry>
-    <entry name="userName" type="String" key="user">
-      <label>User name needed for login</label>
-      <whatsthis>The user name to send to the server for authorization.</whatsthis>
-    </entry>
-    <entry name="precommand" type="String">
-      <label>Command to execute before sending a mail</label>
-      <whatsthis>A command to run locally, prior to sending email. This can be used to set up SSH tunnels, for example. Leave it empty if no command should be run.</whatsthis>
-    </entry>
-    <entry name="requiresAuthentication" type="Bool" key="auth">
-      <label>Server requires authentication</label>
-      <whatsthis>Check this option if your SMTP server requires authentication before accepting mail. This is known as 'Authenticated SMTP' or simply ASMTP.</whatsthis>
-      <default>false</default>
-    </entry>
-    <entry name="storePassword" type="Bool" key="storepass">
-      <label>Store password</label>
-      <whatsthis>Check this option to have your password stored.
-If KWallet is available the password will be stored there, which is considered safe.
-However, if KWallet is not available, the password will be stored in the configuration file. The password is stored in an obfuscated format, but should not be considered secure from decryption efforts if access to the configuration file is obtained.</whatsthis>
-      <default>false</default>
-    </entry>
-    <entry name="encryption" type="Enum">
-      <label>Encryption method used for communication</label>
-      <choices>
-        <choice name="None">
-          <label>No encryption</label>
-        </choice>
-        <choice name="SSL">
-          <label>SSL encryption</label>
-        </choice>
-        <choice name="TLS">
-          <label>TLS encryption</label>
-        </choice>
-      </choices>
-    </entry>
-    <entry name="authenticationType" type="Enum" key="authtype">
-      <label>Authentication method</label>
-      <choices>
-        <!-- TODO - -> _ conversion? -->
-        <choice name="LOGIN"/>
-        <choice name="PLAIN"/>
-        <choice name="CRAM_MD5"/>
-        <choice name="DIGEST_MD5"/>
-        <choice name="GSSAPI"/>
-        <choice name="NTLM"/>
-        <choice name="APOP" />
-        <choice name="CLEAR" />
-        <choice name="ANONYMOUS" />
-      </choices>
-      <default>PLAIN</default>
-    </entry>
-    <entry name="specifyHostname" type="Bool">
-      <label><!-- TODO --></label>
-      <whatsthis>Check this option to use a custom hostname when identifying to the mail server. This is useful when your system's hostname may not be set correctly or to mask your system's true hostname.</whatsthis>
-      <default>false</default>
-    </entry>
-    <entry name="localHostname" type="String">
-      <label><!-- TODO --></label>
-      <whatsthis>Enter the hostname that should be used when identifying to the server.</whatsthis>
-    </entry>
-    <entry name="specifySenderOverwriteAddress" type="Bool">
-      <label><!-- TODO --></label>
-      <whatsthis>Check this option to use a custom sender address when identifying to the mail server. If not checked, the address from the identity is used.</whatsthis>
-      <default>false</default>
-    </entry>
-    <entry name="senderOverwriteAddress" type="String">
-      <label><!-- TODO --></label>
-      <whatsthis>Enter the address that should be used to overwrite the default sender address.</whatsthis>
-    </entry>
-  </group>
-
-</kcfg>
diff -Nru kmailtransport-16.12.3/src/messagequeuejob.cpp kmailtransport-17.04.3/src/messagequeuejob.cpp
--- kmailtransport-16.12.3/src/messagequeuejob.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/messagequeuejob.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,222 +0,0 @@
-/*
-  Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#include "messagequeuejob.h"
-
-#include "transport.h"
-#include "transportattribute.h"
-#include "transportmanager.h"
-
-#include "mailtransport_debug.h"
-#include <KLocalizedString>
-
-#include <collection.h>
-#include <item.h>
-#include <itemcreatejob.h>
-#include <addressattribute.h>
-#include <messageflags.h>
-#include <specialmailcollections.h>
-#include <specialmailcollectionsrequestjob.h>
-
-using namespace Akonadi;
-using namespace KMime;
-using namespace MailTransport;
-
-/**
-  @internal
-*/
-class Q_DECL_HIDDEN MailTransport::MessageQueueJob::Private
-{
-public:
-    Private(MessageQueueJob *qq)
-        : q(qq)
-    {
-        started = false;
-    }
-
-    MessageQueueJob *const q;
-
-    Message::Ptr message;
-    TransportAttribute transportAttribute;
-    DispatchModeAttribute dispatchModeAttribute;
-    SentBehaviourAttribute sentBehaviourAttribute;
-    SentActionAttribute sentActionAttribute;
-    AddressAttribute addressAttribute;
-    bool started;
-
-    /**
-      Returns true if this message has everything it needs and is ready to be
-      sent.
-    */
-    bool validate();
-
-    // slot
-    void outboxRequestResult(KJob *job);
-
-};
-
-bool MessageQueueJob::Private::validate()
-{
-    if (!message) {
-        q->setError(UserDefinedError);
-        q->setErrorText(i18n("Empty message."));
-        q->emitResult();
-        return false;
-    }
-
-    if ((addressAttribute.to().count() + addressAttribute.cc().count() +
-            addressAttribute.bcc().count()) == 0) {
-        q->setError(UserDefinedError);
-        q->setErrorText(i18n("Message has no recipients."));
-        q->emitResult();
-        return false;
-    }
-
-    const int transport = transportAttribute.transportId();
-    if (TransportManager::self()->transportById(transport, false) == Q_NULLPTR) {
-        q->setError(UserDefinedError);
-        q->setErrorText(i18n("Message has invalid transport."));
-        q->emitResult();
-        return false;
-    }
-
-    if (sentBehaviourAttribute.sentBehaviour() == SentBehaviourAttribute::MoveToCollection &&
-            !(sentBehaviourAttribute.moveToCollection().isValid())) {
-        q->setError(UserDefinedError);
-        q->setErrorText(i18n("Message has invalid sent-mail folder."));
-        q->emitResult();
-        return false;
-    } else if (sentBehaviourAttribute.sentBehaviour() ==
-               SentBehaviourAttribute::MoveToDefaultSentCollection) {
-        // TODO require SpecialMailCollections::SentMail here?
-    }
-
-    return true; // all ok
-}
-
-void MessageQueueJob::Private::outboxRequestResult(KJob *job)
-{
-    Q_ASSERT(!started);
-    started = true;
-
-    if (job->error()) {
-        qCritical() << "Failed to get the Outbox folder:" << job->error() << job->errorString();
-        q->setError(job->error());
-        q->emitResult();
-        return;
-    }
-
-    if (!validate()) {
-        // The error has been set; the result has been emitted.
-        return;
-    }
-
-    SpecialMailCollectionsRequestJob *requestJob =
-        qobject_cast<SpecialMailCollectionsRequestJob *>(job);
-    if (!requestJob) {
-        return;
-    }
-
-    // Create item.
-    Item item;
-    item.setMimeType(QStringLiteral("message/rfc822"));
-    item.setPayload<Message::Ptr>(message);
-
-    // Set attributes.
-    item.addAttribute(addressAttribute.clone());
-    item.addAttribute(dispatchModeAttribute.clone());
-    item.addAttribute(sentBehaviourAttribute.clone());
-    item.addAttribute(sentActionAttribute.clone());
-    item.addAttribute(transportAttribute.clone());
-
-    Akonadi::MessageFlags::copyMessageFlags(*message, item);
-    // Set flags.
-    item.setFlag(Akonadi::MessageFlags::Queued);
-
-    // Store the item in the outbox.
-    const Collection collection = requestJob->collection();
-    Q_ASSERT(collection.isValid());
-    ItemCreateJob *cjob = new ItemCreateJob(item, collection);   // job autostarts
-    q->addSubjob(cjob);
-}
-
-MessageQueueJob::MessageQueueJob(QObject *parent)
-    : KCompositeJob(parent), d(new Private(this))
-{
-}
-
-MessageQueueJob::~MessageQueueJob()
-{
-    delete d;
-}
-
-Message::Ptr MessageQueueJob::message() const
-{
-    return d->message;
-}
-
-DispatchModeAttribute &MessageQueueJob::dispatchModeAttribute()
-{
-    return d->dispatchModeAttribute;
-}
-
-AddressAttribute &MessageQueueJob::addressAttribute()
-{
-    return d->addressAttribute;
-}
-
-TransportAttribute &MessageQueueJob::transportAttribute()
-{
-    return d->transportAttribute;
-}
-
-SentBehaviourAttribute &MessageQueueJob::sentBehaviourAttribute()
-{
-    return d->sentBehaviourAttribute;
-}
-
-SentActionAttribute &MessageQueueJob::sentActionAttribute()
-{
-    return d->sentActionAttribute;
-}
-
-void MessageQueueJob::setMessage(const Message::Ptr &message)
-{
-    d->message = message;
-}
-
-void MessageQueueJob::start()
-{
-    SpecialMailCollectionsRequestJob *rjob = new SpecialMailCollectionsRequestJob(this);
-    rjob->requestDefaultCollection(SpecialMailCollections::Outbox);
-    connect(rjob, SIGNAL(result(KJob*)), this, SLOT(outboxRequestResult(KJob*)));
-    rjob->start();
-}
-
-void MessageQueueJob::slotResult(KJob *job)
-{
-    // error handling
-    KCompositeJob::slotResult(job);
-
-    if (!error()) {
-        emitResult();
-    }
-}
-
-#include "moc_messagequeuejob.cpp"
diff -Nru kmailtransport-16.12.3/src/messagequeuejob.h kmailtransport-17.04.3/src/messagequeuejob.h
--- kmailtransport-16.12.3/src/messagequeuejob.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/messagequeuejob.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,171 +0,0 @@
-/*
-  Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_MESSAGEQUEUEJOB_H
-#define MAILTRANSPORT_MESSAGEQUEUEJOB_H
-
-#include <mailtransport_export.h>
-
-#include "dispatchmodeattribute.h"
-#include "sentactionattribute.h"
-#include "sentbehaviourattribute.h"
-#include "transportattribute.h"
-
-#include <QtCore/QDateTime>
-#include <QtCore/QString>
-#include <QtCore/QStringList>
-
-#include <KCompositeJob>
-
-#include <collection.h>
-#include <Akonadi/KMime/AddressAttribute>
-
-#include <kmime/kmime_message.h>
-
-namespace MailTransport
-{
-
-/**
-  @short Provides an interface for sending email.
-
-  This class takes a KMime::Message and some related info such as sender and
-  recipient addresses, and places the message in the outbox.  The mail
-  dispatcher agent will then take it from there and send it.
-
-  This is the preferred way for applications to send email.
-
-  This job requires some options to be set before being started.  Modify the
-  attributes of this job to change these options.
-
-  You need to set the transport of the transport attribute, the from address of
-  the address attribute and one of the to, cc or bcc addresses of the address
-  attribute. Also, you need to call setMessage().
-  Optionally, you can change the dispatch mode attribute or the sent behaviour
-  attribute.
-
-  Example:
-  @code
-
-  MessageQueueJob *job = new MessageQueueJob( this );
-  job->setMessage( msg ); // msg is a Message::Ptr
-  job->transportAttribute().setTransportId( TransportManager::self()->defaultTransportId() );
-  // Use the default dispatch mode.
-  // Use the default sent-behaviour.
-  job->addressAttribute().setFrom( from ); // from is a QString
-  job->addressAttribute().setTo( to ); // to is a QStringList
-  connect( job, SIGNAL(result(KJob*)), this, SLOT(jobResult(KJob*)) );
-  job->start();
-
-  @endcode
-
-  @see DispatchModeAttribute
-  @see SentActionAttribute
-  @see SentBehaviourAttribute
-  @see TransportAttribute
-  @see AddressAttribute
-
-  @author Constantin Berzan <exit3219@gmail.com>
-  @since 4.4
-*/
-class MAILTRANSPORT_EXPORT MessageQueueJob : public KCompositeJob
-{
-    Q_OBJECT
-
-public:
-    /**
-      Creates a new MessageQueueJob.
-      @param parent the QObject parent
-      This is not an autostarting job; you need to call start() yourself.
-    */
-    explicit MessageQueueJob(QObject *parent = Q_NULLPTR);
-
-    /**
-      Destroys the MessageQueueJob.
-      This job deletes itself after finishing.
-    */
-    virtual ~MessageQueueJob();
-
-    /**
-      Returns the message to be sent.
-    */
-    KMime::Message::Ptr message() const;
-
-    /**
-      Returns a reference to the dispatch mode attribue for this message.
-      Modify the returned attribute to change the dispatch mode.
-    */
-    DispatchModeAttribute &dispatchModeAttribute();
-
-    /**
-      Returns a reference to the address attribue for this message.
-      Modify the returned attribute to change the receivers or the from
-      address.
-    */
-    Akonadi::AddressAttribute &addressAttribute();
-
-    /**
-      Returns a reference to the transport attribue for this message.
-      Modify the returned attribute to change the transport used for
-      sending the mail.
-    */
-    TransportAttribute &transportAttribute();
-
-    /**
-      Returns a reference to the sent behaviour attribue for this message.
-      Modify the returned attribute to change the sent behaviour.
-    */
-    SentBehaviourAttribute &sentBehaviourAttribute();
-
-    /**
-      Returns a reference to the sent action attribue for this message.
-      Modify the returned attribute to change the sent actions.
-    */
-    SentActionAttribute &sentActionAttribute();
-
-    /**
-      Sets the message to be sent.
-    */
-    void setMessage(const KMime::Message::Ptr &message);
-
-    /**
-      Creates the item and places it in the outbox.
-      It is now queued for sending by the mail dispatcher agent.
-    */
-    void start()Q_DECL_OVERRIDE;
-
-protected Q_SLOTS:
-    /**
-      Called when the ItemCreateJob subjob finishes.
-
-      (reimplemented from KCompositeJob)
-    */
-    void slotResult(KJob *) Q_DECL_OVERRIDE;
-
-private:
-    class Private;
-    friend class Private;
-    Private *const d;
-
-    Q_PRIVATE_SLOT(d, void outboxRequestResult(KJob *))
-
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_MESSAGEQUEUEJOB_H
diff -Nru kmailtransport-16.12.3/src/Messages.sh kmailtransport-17.04.3/src/Messages.sh
--- kmailtransport-16.12.3/src/Messages.sh	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/Messages.sh	2017-06-19 05:09:24.000000000 +0000
@@ -1,3 +1,3 @@
 #! /bin/sh
 $EXTRACTRC `find . -name \*.ui -o -iname \*.kcfg` >> rc.cpp || exit 11
-$XGETTEXT *.cpp -o $podir/libmailtransport5.pot
+$XGETTEXT `find . -name '*.cpp' | grep -v '/tests/' | grep -v '/autotests/'` -o $podir/libmailtransport5.pot
diff -Nru kmailtransport-16.12.3/src/outboxactions.cpp kmailtransport-17.04.3/src/outboxactions.cpp
--- kmailtransport-16.12.3/src/outboxactions.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/outboxactions.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,161 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "outboxactions_p.h"
-
-#include "mailtransport_debug.h"
-#include "dispatchmodeattribute.h"
-#include "errorattribute.h"
-
-#include <itemmodifyjob.h>
-#include <messageflags.h>
-
-using namespace Akonadi;
-using namespace MailTransport;
-
-class MailTransport::SendQueuedAction::Private
-{
-};
-
-SendQueuedAction::SendQueuedAction()
-    : d(new Private)
-{
-}
-
-SendQueuedAction::~SendQueuedAction()
-{
-    delete d;
-}
-
-ItemFetchScope SendQueuedAction::fetchScope() const
-{
-    ItemFetchScope scope;
-    scope.fetchFullPayload(false);
-    scope.fetchAttribute<DispatchModeAttribute>();
-    scope.fetchAttribute<ErrorAttribute>();
-    scope.setCacheOnly(true);
-    return scope;
-}
-
-bool SendQueuedAction::itemAccepted(const Item &item) const
-{
-    if (!item.hasAttribute<DispatchModeAttribute>()) {
-        qCWarning(MAILTRANSPORT_LOG) << "Item doesn't have DispatchModeAttribute.";
-        return false;
-    }
-
-    return item.attribute<DispatchModeAttribute>()->dispatchMode() == DispatchModeAttribute::Manual;
-}
-
-Job *SendQueuedAction::itemAction(const Item &item, FilterActionJob *parent) const
-{
-    Item cp = item;
-    cp.addAttribute(new DispatchModeAttribute);   // defaults to Automatic
-    if (cp.hasAttribute<ErrorAttribute>()) {
-        cp.removeAttribute<ErrorAttribute>();
-        cp.clearFlag(Akonadi::MessageFlags::HasError);
-    }
-    return new ItemModifyJob(cp, parent);
-}
-
-class MailTransport::ClearErrorAction::Private
-{
-};
-
-ClearErrorAction::ClearErrorAction()
-    : d(new Private)
-{
-}
-
-ClearErrorAction::~ClearErrorAction()
-{
-    delete d;
-}
-
-ItemFetchScope ClearErrorAction::fetchScope() const
-{
-    ItemFetchScope scope;
-    scope.fetchFullPayload(false);
-    scope.fetchAttribute<ErrorAttribute>();
-    scope.setCacheOnly(true);
-    return scope;
-}
-
-bool ClearErrorAction::itemAccepted(const Item &item) const
-{
-    return item.hasAttribute<ErrorAttribute>();
-}
-
-Job *ClearErrorAction::itemAction(const Item &item, FilterActionJob *parent) const
-{
-    Item cp = item;
-    cp.removeAttribute<ErrorAttribute>();
-    cp.clearFlag(Akonadi::MessageFlags::HasError);
-    cp.setFlag(Akonadi::MessageFlags::Queued);
-    return new ItemModifyJob(cp, parent);
-}
-
-class MailTransport::DispatchManualTransportAction::Private
-{
-};
-
-DispatchManualTransportAction::DispatchManualTransportAction(int transportId)
-    : d(new Private), mTransportId(transportId)
-{
-}
-
-DispatchManualTransportAction::~DispatchManualTransportAction()
-{
-    delete d;
-}
-
-ItemFetchScope DispatchManualTransportAction::fetchScope() const
-{
-    ItemFetchScope scope;
-    scope.fetchFullPayload(false);
-    scope.fetchAttribute<TransportAttribute>();
-    scope.fetchAttribute<DispatchModeAttribute>();
-    scope.setCacheOnly(true);
-    return scope;
-}
-
-bool DispatchManualTransportAction::itemAccepted(const Item &item) const
-{
-    if (!item.hasAttribute<DispatchModeAttribute>()) {
-        qCWarning(MAILTRANSPORT_LOG) << "Item doesn't have DispatchModeAttribute.";
-        return false;
-    }
-
-    if (!item.hasAttribute<TransportAttribute>()) {
-        qCWarning(MAILTRANSPORT_LOG) << "Item doesn't have TransportAttribute.";
-        return false;
-    }
-
-    return item.attribute<DispatchModeAttribute>()->dispatchMode() == DispatchModeAttribute::Manual;
-}
-
-Job *DispatchManualTransportAction::itemAction(const Item &item, FilterActionJob *parent) const
-{
-    Item cp = item;
-    cp.attribute<TransportAttribute>()->setTransportId(mTransportId);
-    cp.removeAttribute<DispatchModeAttribute>();
-    cp.addAttribute(new DispatchModeAttribute);   // defaults to Automatic
-    cp.setFlag(Akonadi::MessageFlags::Queued);
-    return new ItemModifyJob(cp, parent);
-}
diff -Nru kmailtransport-16.12.3/src/outboxactions_p.h kmailtransport-17.04.3/src/outboxactions_p.h
--- kmailtransport-16.12.3/src/outboxactions_p.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/outboxactions_p.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,131 +0,0 @@
-/*
-  Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_OUTBOXACTIONS_P_H
-#define MAILTRANSPORT_OUTBOXACTIONS_P_H
-
-#include <mailtransport_export.h>
-#include <filteractionjob_p.h>
-#include <transportattribute.h>
-
-#include <itemfetchscope.h>
-#include <job.h>
-
-namespace MailTransport
-{
-
-/**
-  FilterAction that finds all messages with a DispatchMode of Manual
-  and assigns them a DispatchMode of Immediately.
-
-  This is used to send "queued" messages on demand.
-
-  @see FilterActionJob
-
-  @author Constantin Berzan <exit3219@gmail.com>
-  @since 4.4
-*/
-class SendQueuedAction : public Akonadi::FilterAction
-{
-public:
-    /** Creates a SendQueuedAction. */
-    SendQueuedAction();
-
-    /** Destroys this object. */
-    virtual ~SendQueuedAction();
-
-    Akonadi::ItemFetchScope fetchScope() const Q_DECL_OVERRIDE;
-
-    bool itemAccepted(const Akonadi::Item &item) const Q_DECL_OVERRIDE;
-
-    Akonadi::Job *itemAction(const Akonadi::Item &item,
-                                     Akonadi::FilterActionJob *parent) const Q_DECL_OVERRIDE;
-
-private:
-    class Private;
-    Private *const d;
-};
-
-/**
-  FilterAction that finds all messages with an ErrorAttribute,
-  removes the attribute, and sets the "$QUEUED" flag.
-
-  This is used to retry sending messages that failed.
-
-  @see FilterActionJob
-
-  @author Constantin Berzan <exit3219@gmail.com>
-  @since 4.4
-*/
-class ClearErrorAction : public Akonadi::FilterAction
-{
-public:
-    /** Creates a ClearErrorAction. */
-    ClearErrorAction();
-
-    /** Destroys this object. */
-    virtual ~ClearErrorAction();
-
-    Akonadi::ItemFetchScope fetchScope() const Q_DECL_OVERRIDE;
-
-    bool itemAccepted(const Akonadi::Item &item) const Q_DECL_OVERRIDE;
-
-    virtual Akonadi::Job *itemAction(const Akonadi::Item &item,
-                                     Akonadi::FilterActionJob *parent) const Q_DECL_OVERRIDE;
-
-private:
-    class Private;
-    Private *const d;
-};
-
-/**
-  FilterAction that changes the transport for all messages and
-  sets the "$QUEUED" flag.
-
-  This is used to send queued messages using an alternative transport.
-
-  @see FilterActionJob
-
-  @author Torgny Nyblom <kde nyblom org>
-  @since 4.5
-*/
-class DispatchManualTransportAction : public Akonadi::FilterAction
-{
-public:
-    DispatchManualTransportAction(int transportId);
-
-    virtual ~DispatchManualTransportAction();
-
-    Akonadi::ItemFetchScope fetchScope() const Q_DECL_OVERRIDE;
-
-    bool itemAccepted(const Akonadi::Item &item) const Q_DECL_OVERRIDE;
-
-    virtual Akonadi::Job *itemAction(const Akonadi::Item &item,
-                                     Akonadi::FilterActionJob *parent) const Q_DECL_OVERRIDE;
-
-private:
-    class Private;
-    Private *const d;
-
-    int mTransportId;
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_OUTBOXACTIONS_P_H
diff -Nru kmailtransport-16.12.3/src/precommandjob.cpp kmailtransport-17.04.3/src/precommandjob.cpp
--- kmailtransport-16.12.3/src/precommandjob.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/precommandjob.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,114 +0,0 @@
-/*
-    Copyright (c) 2007 Volker Krause <vkrause@kde.org>
-
-    Based on KMail code by:
-    Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
-    Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "precommandjob.h"
-
-#include <KLocalizedString>
-
-#include <QProcess>
-
-using namespace MailTransport;
-
-/**
- * Private class that helps to provide binary compatibility between releases.
- * @internal
- */
-class PreCommandJobPrivate
-{
-public:
-    PreCommandJobPrivate(PrecommandJob *parent);
-    QProcess *process;
-    QString precommand;
-    PrecommandJob *q;
-
-    // Slots
-    void slotFinished(int, QProcess::ExitStatus);
-    void slotStarted();
-    void slotError(QProcess::ProcessError error);
-};
-
-PreCommandJobPrivate::PreCommandJobPrivate(PrecommandJob *parent)
-    : process(Q_NULLPTR), q(parent)
-{
-}
-
-PrecommandJob::PrecommandJob(const QString &precommand, QObject *parent)
-    : KJob(parent), d(new PreCommandJobPrivate(this))
-{
-    d->precommand = precommand;
-    d->process = new QProcess(this);
-    connect(d->process, SIGNAL(started()), SLOT(slotStarted()));
-    connect(d->process, SIGNAL(error(QProcess::ProcessError)),
-            SLOT(slotError(QProcess::ProcessError)));
-    connect(d->process, SIGNAL(finished(int,QProcess::ExitStatus)),
-            SLOT(slotFinished(int,QProcess::ExitStatus)));
-}
-
-PrecommandJob::~ PrecommandJob()
-{
-    delete d;
-}
-
-void PrecommandJob::start()
-{
-    d->process->start(d->precommand);
-}
-
-void PreCommandJobPrivate::slotStarted()
-{
-    emit q->infoMessage(q, i18n("Executing precommand"),
-                        i18n("Executing precommand '%1'.", precommand));
-}
-
-void PreCommandJobPrivate::slotError(QProcess::ProcessError error)
-{
-    q->setError(KJob::UserDefinedError);
-    if (error == QProcess::FailedToStart) {
-        q->setErrorText(i18n("Unable to start precommand '%1'.", precommand));
-    } else {
-        q->setErrorText(i18n("Error while executing precommand '%1'.", precommand));
-    }
-    q->emitResult();
-}
-
-bool PrecommandJob::doKill()
-{
-    delete d->process;
-    d->process = Q_NULLPTR;
-    return true;
-}
-
-void PreCommandJobPrivate::slotFinished(int exitCode, QProcess::ExitStatus exitStatus)
-{
-    if (exitStatus == QProcess::CrashExit) {
-        q->setError(KJob::UserDefinedError);
-        q->setErrorText(i18n("The precommand crashed."));
-    } else if (exitCode != 0) {
-        q->setError(KJob::UserDefinedError);
-        q->setErrorText(i18n("The precommand exited with code %1.",
-                             process->exitStatus()));
-    }
-    q->emitResult();
-}
-
-#include "moc_precommandjob.cpp"
diff -Nru kmailtransport-16.12.3/src/precommandjob.h kmailtransport-17.04.3/src/precommandjob.h
--- kmailtransport-16.12.3/src/precommandjob.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/precommandjob.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,84 +0,0 @@
-/*
-    Copyright (c) 2007 Volker Krause <vkrause@kde.org>
-
-    Based on KMail code by:
-    Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
-    Copyright (c) 2000-2002 Michael Haeckel <haeckel@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_PRECOMMANDJOB_H
-#define MAILTRANSPORT_PRECOMMANDJOB_H
-
-#include "mailtransport_export.h"
-
-#include <KJob>
-
-class PreCommandJobPrivate;
-
-namespace MailTransport
-{
-
-/**
-  Job to execute a command.
-  This is used often for sending or receiving mails, for example to set up
-  a tunnel of VPN connection.
-  Basically this is just a KJob wrapper around a QProcess.
-
-  @since 4.4
- */
-class MAILTRANSPORT_EXPORT PrecommandJob : public KJob
-{
-    Q_OBJECT
-
-public:
-    /**
-      Creates a new precommand job.
-      @param precommand The command to run.
-      @param parent The parent object.
-    */
-    explicit PrecommandJob(const QString &precommand, QObject *parent = Q_NULLPTR);
-
-    /**
-      Destroys this job.
-    */
-    virtual ~PrecommandJob();
-
-    /**
-      Executes the precommand.
-      Reimplemented from KJob.
-    */
-    void start() Q_DECL_OVERRIDE;
-
-protected:
-
-    /**
-      Reimplemented from KJob.
-    */
-    bool doKill() Q_DECL_OVERRIDE;
-
-private:
-    friend class ::PreCommandJobPrivate;
-    PreCommandJobPrivate *const d;
-    Q_PRIVATE_SLOT(d, void slotFinished(int, QProcess::ExitStatus))
-    Q_PRIVATE_SLOT(d, void slotStarted())
-    Q_PRIVATE_SLOT(d, void slotError(QProcess::ProcessError error))
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_PRECOMMANDJOB_H
diff -Nru kmailtransport-16.12.3/src/resourcesendjob.cpp kmailtransport-17.04.3/src/resourcesendjob.cpp
--- kmailtransport-16.12.3/src/resourcesendjob.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/resourcesendjob.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "resourcesendjob_p.h"
-#include "messagequeuejob.h"
-#include "transport.h"
-
-#include <QDBusConnection>
-#include <QDBusConnectionInterface>
-
-#include <kmime/kmime_message.h>
-
-#include <collection.h>
-#include <itemcreatejob.h>
-#include <itemfetchjob.h>
-#include <itemfetchscope.h>
-#include <addressattribute.h>
-
-using namespace Akonadi;
-using namespace KMime;
-using namespace MailTransport;
-
-/**
- * Private class that helps to provide binary compatibility between releases.
- * @internal
- */
-class MailTransport::ResourceSendJobPrivate
-{
-public:
-    ResourceSendJobPrivate(ResourceSendJob *qq)
-        : q(qq)
-    {
-    }
-
-    void slotEmitResult(); // slot
-
-    ResourceSendJob *const q;
-};
-
-void ResourceSendJobPrivate::slotEmitResult()
-{
-    // KCompositeJob took care of the error.
-    q->emitResult();
-}
-
-ResourceSendJob::ResourceSendJob(Transport *transport, QObject *parent)
-    : TransportJob(transport, parent), d(new ResourceSendJobPrivate(this))
-{
-}
-
-ResourceSendJob::~ResourceSendJob()
-{
-    delete d;
-}
-
-void ResourceSendJob::doStart()
-{
-    Message::Ptr msg = Message::Ptr(new Message);
-    msg->setContent(data());
-    MessageQueueJob *job = new MessageQueueJob;
-    job->setMessage(msg);
-    job->transportAttribute().setTransportId(transport()->id());
-    // Default dispatch mode (send now).
-    // Move to default sent-mail collection.
-    job->addressAttribute().setFrom(sender());
-    job->addressAttribute().setTo(to());
-    job->addressAttribute().setCc(cc());
-    job->addressAttribute().setBcc(bcc());
-    addSubjob(job);
-    // Once the item is in the outbox, there is nothing more we can do.
-    connect(job, SIGNAL(result(KJob*)), this, SLOT(slotEmitResult()));
-    job->start();
-}
-
-#include "moc_resourcesendjob_p.cpp"
diff -Nru kmailtransport-16.12.3/src/resourcesendjob_p.h kmailtransport-17.04.3/src/resourcesendjob_p.h
--- kmailtransport-16.12.3/src/resourcesendjob_p.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/resourcesendjob_p.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,72 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_RESOURCESENDJOB_P_H
-#define MAILTRANSPORT_RESOURCESENDJOB_P_H
-
-#include <transportjob.h>
-
-#include <item.h>
-
-namespace MailTransport
-{
-
-class ResourceSendJobPrivate;
-
-/**
-  Mail transport job for an Akonadi resource-based transport.
-
-  This is a wrapper job that makes old applications work with resource-based
-  transports.  It calls the appropriate methods in MessageQueueJob, and emits
-  result() as soon as the item is placed in the outbox, since there is no way
-  of monitoring the progress from here.
-
-  @author Constantin Berzan <exit3219@gmail.com>
-  @since 4.4
-*/
-class ResourceSendJob : public TransportJob
-{
-    Q_OBJECT
-public:
-    /**
-      Creates an ResourceSendJob.
-      @param transport The transport object to use.
-      @param parent The parent object.
-    */
-    explicit ResourceSendJob(Transport *transport, QObject *parent = Q_NULLPTR);
-
-    /**
-      Destroys this job.
-    */
-    virtual ~ResourceSendJob();
-
-protected:
-    void doStart() Q_DECL_OVERRIDE;
-
-private:
-    friend class ResourceSendJobPrivate;
-    ResourceSendJobPrivate *const d;
-
-    Q_PRIVATE_SLOT(d, void slotEmitResult())
-
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_RESOURCESENDJOB_H
diff -Nru kmailtransport-16.12.3/src/sentactionattribute.cpp kmailtransport-17.04.3/src/sentactionattribute.cpp
--- kmailtransport-16.12.3/src/sentactionattribute.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/sentactionattribute.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,171 +0,0 @@
-/*
-  Copyright (C) 2010 Klarälvdalens Datakonsult AB,
-      a KDAB Group company, info@kdab.net,
-      author Tobias Koenig <tokoe@kdab.com>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#include "sentactionattribute.h"
-
-#include <QtCore/QDataStream>
-#include <QtCore/QSharedData>
-
-using namespace Akonadi;
-using namespace MailTransport;
-
-class SentActionAttribute::Action::Private : public QSharedData
-{
-public:
-    Private()
-        : mType(Invalid)
-    {
-    }
-
-    Private(const Private &other)
-        : QSharedData(other)
-    {
-        mType = other.mType;
-        mValue = other.mValue;
-    }
-
-    Type mType;
-    QVariant mValue;
-};
-
-SentActionAttribute::Action::Action()
-    : d(new Private)
-{
-}
-
-SentActionAttribute::Action::Action(Type type, const QVariant &value)
-    : d(new Private)
-{
-    d->mType = type;
-    d->mValue = value;
-}
-
-SentActionAttribute::Action::Action(const Action &other)
-    : d(other.d)
-{
-}
-
-SentActionAttribute::Action::~Action()
-{
-}
-
-SentActionAttribute::Action::Type SentActionAttribute::Action::type() const
-{
-    return d->mType;
-}
-
-QVariant SentActionAttribute::Action::value() const
-{
-    return d->mValue;
-}
-
-SentActionAttribute::Action &SentActionAttribute::Action::operator=(const Action &other)
-{
-    if (this != &other) {
-        d = other.d;
-    }
-
-    return *this;
-}
-
-bool SentActionAttribute::Action::operator==(const Action &other) const
-{
-    return ((d->mType == other.d->mType) && (d->mValue == other.d->mValue));
-}
-
-class SentActionAttribute::Private
-{
-public:
-    Action::List mActions;
-};
-
-SentActionAttribute::SentActionAttribute()
-    : d(new Private)
-{
-}
-
-SentActionAttribute::~SentActionAttribute()
-{
-    delete d;
-}
-
-void SentActionAttribute::addAction(Action::Type type, const QVariant &value)
-{
-    d->mActions.append(Action(type, value));
-}
-
-SentActionAttribute::Action::List SentActionAttribute::actions() const
-{
-    return d->mActions;
-}
-
-SentActionAttribute *SentActionAttribute::clone() const
-{
-    SentActionAttribute *attribute = new SentActionAttribute;
-    attribute->d->mActions = d->mActions;
-
-    return attribute;
-}
-
-QByteArray SentActionAttribute::type() const
-{
-    static const QByteArray sType("SentActionAttribute");
-    return sType;
-}
-
-QByteArray SentActionAttribute::serialized() const
-{
-    QVariantList list;
-    list.reserve(d->mActions.count());
-    foreach (const Action &action, d->mActions) {
-        QVariantMap map;
-        map.insert(QString::number(action.type()), action.value());
-
-        list << QVariant(map);
-    }
-
-    QByteArray data;
-    QDataStream stream(&data, QIODevice::WriteOnly);
-    stream.setVersion(QDataStream::Qt_4_6);
-    stream << list;
-
-    return data;
-}
-
-void SentActionAttribute::deserialize(const QByteArray &data)
-{
-    d->mActions.clear();
-
-    QDataStream stream(data);
-    stream.setVersion(QDataStream::Qt_4_6);
-
-    QVariantList list;
-    stream >> list;
-
-    foreach (const QVariant &variant, list) {
-        const QVariantMap map = variant.toMap();
-        QMapIterator<QString, QVariant> it(map);
-        while (it.hasNext()) {
-            it.next();
-            d->mActions << Action(static_cast<Action::Type>(it.key().toInt()), it.value());
-        }
-    }
-}
diff -Nru kmailtransport-16.12.3/src/sentactionattribute.h kmailtransport-17.04.3/src/sentactionattribute.h
--- kmailtransport-16.12.3/src/sentactionattribute.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/sentactionattribute.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,156 +0,0 @@
-/*
-  Copyright (C) 2010 Klarälvdalens Datakonsult AB,
-      a KDAB Group company, info@kdab.net,
-      author Tobias Koenig <tokoe@kdab.com>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_SENTACTIONATTRIBUTE_H
-#define MAILTRANSPORT_SENTACTIONATTRIBUTE_H
-
-#include <mailtransport_export.h>
-
-#include <QtCore/QSharedDataPointer>
-#include <QtCore/QVariant>
-#include <QtCore/QVector>
-#include <attribute.h>
-
-namespace MailTransport
-{
-
-/**
- * @short An Attribute that stores the action to execute after sending.
- *
- * This attribute stores the action that will be executed by the mail dispatcher
- * after a mail has successfully be sent.
- *
- * @author Tobias Koenig <tokoe@kdab.com>
- * @since 4.6
- */
-class MAILTRANSPORT_EXPORT SentActionAttribute : public Akonadi::Attribute
-{
-public:
-    /**
-     * @short A sent action.
-     */
-    class MAILTRANSPORT_EXPORT Action
-    {
-    public:
-        /**
-         * Describes the action type.
-         */
-        enum Type {
-            Invalid,         ///< An invalid action.
-            MarkAsReplied,   ///< The message will be marked as replied.
-            MarkAsForwarded  ///< The message will be marked as forwarded.
-        };
-
-        /**
-         * Describes a list of sent actions.
-         */
-        typedef QVector<Action> List;
-
-        /**
-         * Creates a new invalid action.
-         */
-        Action();
-
-        /**
-         * Creates a new action.
-         *
-         * @param action The action that shall be executed.
-         * @param value The action specific argument.
-         */
-        Action(Type type, const QVariant &value);
-
-        /**
-         * Creates an action from an @p other action.
-         */
-        Action(const Action &other);
-
-        /**
-         * Destroys the action.
-         */
-        ~Action();
-
-        /**
-         * Returns the type of the action.
-         */
-        Type type() const;
-
-        /**
-         * Returns the argument value of the action.
-         */
-        QVariant value() const;
-
-        /**
-         * @internal
-         */
-        Action &operator=(const Action &other);
-
-        /**
-         * @internal
-         */
-        bool operator==(const Action &other) const;
-
-    private:
-        //@cond PRIVATE
-        class Private;
-        QSharedDataPointer<Private> d;
-        //@endcond
-    };
-
-    /**
-     * Creates a new sent action attribute.
-     */
-    explicit SentActionAttribute();
-
-    /**
-     * Destroys the sent action attribute.
-     */
-    virtual ~SentActionAttribute();
-
-    /**
-     * Adds a new action to the attribute.
-     *
-     * @param type The type of the action that shall be executed.
-     * @param value The action specific argument.
-     */
-    void addAction(Action::Type type, const QVariant &value);
-
-    /**
-     * Returns the list of actions.
-     */
-    Action::List actions() const;
-
-    /* reimpl */
-    SentActionAttribute *clone() const Q_DECL_OVERRIDE;
-    QByteArray type() const Q_DECL_OVERRIDE;
-    QByteArray serialized() const Q_DECL_OVERRIDE;
-    void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
-
-private:
-    //@cond PRIVATE
-    class Private;
-    Private *const d;
-    //@endcond
-};
-
-}
-Q_DECLARE_TYPEINFO(MailTransport::SentActionAttribute::Action, Q_MOVABLE_TYPE);
-
-#endif
diff -Nru kmailtransport-16.12.3/src/sentbehaviourattribute.cpp kmailtransport-17.04.3/src/sentbehaviourattribute.cpp
--- kmailtransport-16.12.3/src/sentbehaviourattribute.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/sentbehaviourattribute.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,137 +0,0 @@
-/*
-    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "sentbehaviourattribute.h"
-
-using namespace Akonadi;
-using namespace MailTransport;
-
-class SentBehaviourAttribute::Private
-{
-public:
-    SentBehaviourAttribute::SentBehaviour mBehaviour;
-    Akonadi::Collection mMoveToCollection;
-    bool mSilent;
-};
-
-SentBehaviourAttribute::SentBehaviourAttribute(SentBehaviour beh, const Collection &moveToCollection,
-                                               bool sendSilently)
-    : d(new Private)
-{
-    d->mBehaviour = beh;
-    d->mMoveToCollection = moveToCollection;
-    d->mSilent = sendSilently;
-}
-
-SentBehaviourAttribute::~SentBehaviourAttribute()
-{
-    delete d;
-}
-
-SentBehaviourAttribute *SentBehaviourAttribute::clone() const
-{
-    return new SentBehaviourAttribute(d->mBehaviour, d->mMoveToCollection, d->mSilent);
-}
-
-QByteArray SentBehaviourAttribute::type() const
-{
-    static const QByteArray sType("SentBehaviourAttribute");
-    return sType;
-}
-
-QByteArray SentBehaviourAttribute::serialized() const
-{
-    QByteArray out;
-
-    switch (d->mBehaviour) {
-    case Delete:
-        out = "delete";
-        break;
-    case MoveToCollection: 
-        out = "moveTo" + QByteArray::number(d->mMoveToCollection.id());
-        break;
-    case MoveToDefaultSentCollection:
-        out = "moveToDefault";
-        break;
-    default:
-        Q_ASSERT(false);
-        return QByteArray();
-    }
-
-    if (d->mSilent) {
-        out += ",silent";
-    }
-
-    return out;
-}
-
-void SentBehaviourAttribute::deserialize(const QByteArray &data)
-{
-    const QByteArrayList in = data.split(',');
-    Q_ASSERT(in.size() > 0);
-
-    const QByteArray attr0 = in[0];
-    d->mMoveToCollection = Akonadi::Collection(-1);
-    if (attr0 == "delete") {
-        d->mBehaviour = Delete;
-    } else if (attr0 == "moveToDefault") {
-        d->mBehaviour = MoveToDefaultSentCollection;
-    } else if (attr0.startsWith(QByteArray("moveTo"))) {
-        d->mBehaviour = MoveToCollection;
-        d->mMoveToCollection = Akonadi::Collection(attr0.mid(6).toLongLong());
-        // NOTE: 6 is the strlen of "moveTo".
-    } else {
-        Q_ASSERT(false);
-    }
-
-    if (in.size() == 2 && in[1] == "silent") {
-        d->mSilent = true;
-    }
-}
-
-SentBehaviourAttribute::SentBehaviour SentBehaviourAttribute::sentBehaviour() const
-{
-    return d->mBehaviour;
-}
-
-void SentBehaviourAttribute::setSentBehaviour(SentBehaviour beh)
-{
-    d->mBehaviour = beh;
-}
-
-Collection SentBehaviourAttribute::moveToCollection() const
-{
-    return d->mMoveToCollection;
-}
-
-void SentBehaviourAttribute::setMoveToCollection(const Collection &moveToCollection)
-{
-    d->mMoveToCollection = moveToCollection;
-}
-
-bool SentBehaviourAttribute::sendSilently() const
-{
-    return d->mSilent;
-}
-
-void SentBehaviourAttribute::setSendSilently(bool sendSilently)
-{
-    d->mSilent = sendSilently;
-}
-
diff -Nru kmailtransport-16.12.3/src/sentbehaviourattribute.h kmailtransport-17.04.3/src/sentbehaviourattribute.h
--- kmailtransport-16.12.3/src/sentbehaviourattribute.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/sentbehaviourattribute.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,118 +0,0 @@
-/*
-    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_SENTBEHAVIOURATTRIBUTE_H
-#define MAILTRANSPORT_SENTBEHAVIOURATTRIBUTE_H
-
-#include <mailtransport_export.h>
-
-#include <attribute.h>
-#include <collection.h>
-
-namespace MailTransport
-{
-
-/**
-  Attribute determining what will happen to a message after it is sent.  The
-  message can be deleted from the Outbox, moved to the default sent-mail
-  collection, or moved to a custom collection.
-
-  @author Constantin Berzan <exit3219@gmail.com>
-  @since 4.4
-*/
-class MAILTRANSPORT_EXPORT SentBehaviourAttribute : public Akonadi::Attribute
-{
-public:
-    /**
-      What to do with the item in the outbox after it has been sent successfully.
-    */
-    enum SentBehaviour {
-        Delete,                      ///< Delete the item from the outbox.
-        MoveToCollection,            ///< Move the item to a custom collection.
-        MoveToDefaultSentCollection  ///< Move the item to the default sent-mail collection.
-    };
-
-    /**
-      Creates a new SentBehaviourAttribute.
-    */
-    explicit SentBehaviourAttribute(SentBehaviour beh = MoveToDefaultSentCollection,
-                                    const Akonadi::Collection &moveToCollection = Akonadi::Collection(-1),
-                                    bool sendSilently = false);
-
-    /**
-      Destroys the SentBehaviourAttribute.
-    */
-    virtual ~SentBehaviourAttribute();
-
-    /* reimpl */
-    SentBehaviourAttribute *clone() const Q_DECL_OVERRIDE;
-    QByteArray type() const Q_DECL_OVERRIDE;
-    QByteArray serialized() const Q_DECL_OVERRIDE;
-    void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
-
-    /**
-      Returns the sent-behaviour of the message.
-      @see SentBehaviour.
-    */
-    SentBehaviour sentBehaviour() const;
-
-    /**
-      Sets the sent-behaviour of the message.
-      @param beh the sent-behaviour to set
-      @see SentBehaviour.
-    */
-    void setSentBehaviour(SentBehaviour beh);
-
-    /**
-      Returns the collection to which the item should be moved after it is sent.
-      Only valid if sentBehaviour() is MoveToCollection.
-    */
-    Akonadi::Collection moveToCollection() const;
-
-    /**
-      Sets the collection to which the item should be moved after it is sent.
-      Make sure you set the SentBehaviour to MoveToCollection first.
-      @param moveToCollection target collection for "move to" operation
-      @see setSentBehaviour.
-    */
-    void setMoveToCollection(const Akonadi::Collection &moveToCollection);
-
-    /**
-     * Returns whether a notification should be shown after the email is sent.
-     * @since 5.4
-     */
-    bool sendSilently() const;
-
-    /**
-     * Set whether a notification should be shown after the email is sent.
-     *
-     * Default is false.
-     *
-     * @since 5.4
-     */
-    void setSendSilently(bool sendSilently);
-private:
-    class Private;
-    Private *const d;
-
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_SENTBEHAVIOURATTRIBUTE_H
diff -Nru kmailtransport-16.12.3/src/servertest.cpp kmailtransport-17.04.3/src/servertest.cpp
--- kmailtransport-16.12.3/src/servertest.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/servertest.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,627 +0,0 @@
-/*
-  Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-  Copyright (C) 2007 KovoKs <info@kovoks.nl>
-  Copyright (c) 2008 Thomas McGuire <thomas.mcguire@gmx.net>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-// Own
-#include "servertest.h"
-#include "socket.h"
-
-#include <transportbase.h>
-#include <mailtransport_defs.h>
-
-// Qt
-#include <QHash>
-#include <QHostInfo>
-#include <QProgressBar>
-#include <QTimer>
-
-// KDE
-#include "mailtransport_debug.h"
-
-using namespace MailTransport;
-
-namespace MailTransport
-{
-
-class ServerTestPrivate
-{
-public:
-    ServerTestPrivate(ServerTest *test);
-
-    ServerTest *const              q;
-    QString                        server;
-    QString                        fakeHostname;
-    QString                        testProtocol;
-
-    MailTransport::Socket         *normalSocket;
-    MailTransport::Socket         *secureSocket;
-
-    QSet< int >                    connectionResults;
-    QHash< int, QList<int> >       authenticationResults;
-    QSet< ServerTest::Capability > capabilityResults;
-    QHash< int, uint >             customPorts;
-    QTimer                        *normalSocketTimer;
-    QTimer                        *secureSocketTimer;
-    QTimer                        *progressTimer;
-
-    QProgressBar                  *testProgress;
-
-    bool                           secureSocketFinished;
-    bool                           normalSocketFinished;
-    bool                           tlsFinished;
-    bool                           popSupportsTLS;
-    int                            normalStage;
-    int                            secureStage;
-    int                            encryptionMode;
-
-    bool                           normalPossible;
-    bool                           securePossible;
-
-    void finalResult();
-    void handleSMTPIMAPResponse(int type, const QString &text);
-    void sendInitialCapabilityQuery(MailTransport::Socket *socket);
-    bool handlePopConversation(MailTransport::Socket *socket, int type, int stage,
-                               const QString &response, bool *shouldStartTLS);
-    QList< int > parseAuthenticationList(const QStringList &authentications);
-
-    // slots
-    void slotNormalPossible();
-    void slotNormalNotPossible();
-    void slotSslPossible();
-    void slotSslNotPossible();
-    void slotTlsDone();
-    void slotReadNormal(const QString &text);
-    void slotReadSecure(const QString &text);
-    void slotUpdateProgress();
-};
-
-}
-
-ServerTestPrivate::ServerTestPrivate(ServerTest *test)
-    : q(test), testProgress(Q_NULLPTR), secureSocketFinished(false),
-      normalSocketFinished(false), tlsFinished(false),
-      normalPossible(true), securePossible(true)
-{
-}
-
-void ServerTestPrivate::finalResult()
-{
-    if (!secureSocketFinished || !normalSocketFinished || !tlsFinished) {
-        return;
-    }
-
-    qCDebug(MAILTRANSPORT_LOG) << "Modes:" << connectionResults;
-    qCDebug(MAILTRANSPORT_LOG) << "Capabilities:" << capabilityResults;
-    qCDebug(MAILTRANSPORT_LOG) << "Normal:" <<  q->normalProtocols();
-    qCDebug(MAILTRANSPORT_LOG) << "SSL:" <<  q->secureProtocols();
-    qCDebug(MAILTRANSPORT_LOG) << "TLS:" <<  q->tlsProtocols();
-
-    if (testProgress) {
-        testProgress->hide();
-    }
-    progressTimer->stop();
-    secureSocketFinished =  false;
-    normalSocketFinished =  false;
-    tlsFinished = false ;
-
-    emit q->finished(connectionResults.toList());
-}
-
-QList< int > ServerTestPrivate::parseAuthenticationList(const QStringList &authentications)
-{
-    QList< int > result;
-    for (QStringList::ConstIterator it = authentications.begin();
-            it != authentications.end(); ++it) {
-        QString current = (*it).toUpper();
-        if (current == QLatin1String("LOGIN")) {
-            result << Transport::EnumAuthenticationType::LOGIN;
-        } else if (current == QLatin1String("PLAIN")) {
-            result << Transport::EnumAuthenticationType::PLAIN;
-        } else if (current == QLatin1String("CRAM-MD5")) {
-            result << Transport::EnumAuthenticationType::CRAM_MD5;
-        } else if (current == QLatin1String("DIGEST-MD5")) {
-            result << Transport::EnumAuthenticationType::DIGEST_MD5;
-        } else if (current == QLatin1String("NTLM")) {
-            result << Transport::EnumAuthenticationType::NTLM;
-        } else if (current == QLatin1String("GSSAPI")) {
-            result << Transport::EnumAuthenticationType::GSSAPI;
-        } else if (current == QLatin1String("ANONYMOUS")) {
-            result << Transport::EnumAuthenticationType::ANONYMOUS;
-        }
-        // APOP is handled by handlePopConversation()
-    }
-    qCDebug(MAILTRANSPORT_LOG) << authentications << result;
-
-    // LOGIN doesn't offer anything over PLAIN, requires more server
-    // roundtrips and is not an official SASL mechanism, but a MS-ism,
-    // so only enable it if PLAIN isn't available:
-    if (result.contains(Transport::EnumAuthenticationType::PLAIN)) {
-        result.removeAll(Transport::EnumAuthenticationType::LOGIN);
-    }
-
-    return result;
-}
-
-void ServerTestPrivate::handleSMTPIMAPResponse(int type, const QString &text)
-{
-    if (!text.contains(QLatin1String("AUTH"), Qt::CaseInsensitive)) {
-        qCDebug(MAILTRANSPORT_LOG) << "No authentication possible";
-        return;
-    }
-
-    QStringList protocols;
-    protocols << QStringLiteral("LOGIN") << QStringLiteral("PLAIN")
-              << QStringLiteral("CRAM-MD5") << QStringLiteral("DIGEST-MD5")
-              << QStringLiteral("NTLM") << QStringLiteral("GSSAPI")
-              << QStringLiteral("ANONYMOUS");
-
-    QStringList results;
-    for (int i = 0; i < protocols.count(); ++i) {
-        if (text.contains(protocols.at(i), Qt::CaseInsensitive)) {
-            results.append(protocols.at(i));
-        }
-    }
-
-    authenticationResults[type] = parseAuthenticationList(results);
-
-    // if we couldn't parse any authentication modes, default to clear-text
-    if (authenticationResults[type].size() == 0) {
-        authenticationResults[type] << Transport::EnumAuthenticationType::CLEAR;
-    }
-
-    qCDebug(MAILTRANSPORT_LOG) << "For type" << type << ", we have:" << authenticationResults[type];
-}
-
-void ServerTestPrivate::slotNormalPossible()
-{
-    normalSocketTimer->stop();
-    connectionResults << Transport::EnumEncryption::None;
-}
-
-void ServerTestPrivate::sendInitialCapabilityQuery(MailTransport::Socket *socket)
-{
-    if (testProtocol == IMAP_PROTOCOL) {
-        socket->write(QStringLiteral("1 CAPABILITY"));
-
-    } else if (testProtocol == SMTP_PROTOCOL) {
-
-        // Detect the hostname which we send with the EHLO command.
-        // If there is a fake one set, use that, otherwise use the
-        // local host name (and make sure it contains a domain, so the
-        // server thinks it is valid).
-        QString hostname;
-        if (!fakeHostname.isNull()) {
-            hostname = fakeHostname;
-        } else {
-            hostname = QHostInfo::localHostName();
-            if (hostname.isEmpty()) {
-                hostname = QStringLiteral("localhost.invalid");
-            } else if (!hostname.contains(QChar::fromLatin1('.'))) {
-                hostname += QLatin1String(".localnet");
-            }
-        }
-        qCDebug(MAILTRANSPORT_LOG) << "Hostname for EHLO is" << hostname;
-
-        socket->write(QLatin1String("EHLO ") + hostname);
-    }
-}
-
-void ServerTestPrivate::slotTlsDone()
-{
-
-    // The server will not send a response after starting TLS. Therefore, we have to manually
-    // call slotReadNormal(), because this is not triggered by a data received signal this time.
-    slotReadNormal(QString());
-}
-
-bool ServerTestPrivate::handlePopConversation(MailTransport::Socket *socket, int type, int stage,
-        const QString &response, bool *shouldStartTLS)
-{
-    Q_ASSERT(shouldStartTLS != 0);
-
-    // Initial Greeting
-    if (stage == 0) {
-
-        //Regexp taken from POP3 ioslave
-        QString responseWithoutCRLF = response;
-        responseWithoutCRLF.chop(2);
-        QRegExp re(QStringLiteral("<[A-Za-z0-9\\.\\-_]+@[A-Za-z0-9\\.\\-_]+>$"),
-                   Qt::CaseInsensitive);
-        if (responseWithoutCRLF.indexOf(re) != -1) {
-            authenticationResults[type] << Transport::EnumAuthenticationType::APOP;
-        }
-
-        //Each server is supposed to support clear text login
-        authenticationResults[type] << Transport::EnumAuthenticationType::CLEAR;
-
-        // If we are in TLS stage, the server does not send the initial greeting.
-        // Assume that the APOP availability is the same as with an unsecured connection.
-        if (type == Transport::EnumEncryption::TLS &&
-                authenticationResults[Transport::EnumEncryption::None].
-                contains(Transport::EnumAuthenticationType::APOP)) {
-            authenticationResults[Transport::EnumEncryption::TLS]
-                    << Transport::EnumAuthenticationType::APOP;
-        }
-
-        socket->write(QStringLiteral("CAPA"));
-        return true;
-    }
-
-    // CAPA result
-    else if (stage == 1) {
-//     Example:
-//     CAPA
-//     +OK
-//     TOP
-//     USER
-//     SASL LOGIN CRAM-MD5
-//     UIDL
-//     RESP-CODES
-//     .
-        if (response.contains(QLatin1String("TOP"))) {
-            capabilityResults += ServerTest::Top;
-        }
-        if (response.contains(QLatin1String("PIPELINING"))) {
-            capabilityResults += ServerTest::Pipelining;
-        }
-        if (response.contains(QLatin1String("UIDL"))) {
-            capabilityResults += ServerTest::UIDL;
-        }
-        if (response.contains(QLatin1String("STLS"))) {
-            connectionResults << Transport::EnumEncryption::TLS;
-            popSupportsTLS = true;
-        }
-        socket->write(QStringLiteral("AUTH"));
-        return true;
-    }
-
-    // AUTH response
-    else if (stage == 2) {
-//     Example:
-//     C: AUTH
-//     S: +OK List of supported authentication methods follows
-//     S: LOGIN
-//     S: CRAM-MD5
-//     S:.
-        QString formattedReply = response;
-
-        // Get rid of trailling ".CRLF"
-        formattedReply.chop(3);
-
-        // Get rid of the first +OK line
-        formattedReply = formattedReply.right(formattedReply.size() -
-                                              formattedReply.indexOf(QLatin1Char('\n')) - 1);
-        formattedReply =
-            formattedReply.replace(QLatin1Char(' '), QLatin1Char('-')).
-            replace(QLatin1String("\r\n"), QLatin1String(" "));
-
-        authenticationResults[type] +=
-            parseAuthenticationList(formattedReply.split(QLatin1Char(' ')));
-    }
-
-    *shouldStartTLS = popSupportsTLS;
-    return false;
-}
-
-// slotReadNormal() handles normal (no) encryption and TLS encryption.
-// At first, the communication is not encrypted, but if the server supports
-// the STARTTLS/STLS keyword, the same authentication query is done again
-// with TLS.
-void ServerTestPrivate::slotReadNormal(const QString &text)
-{
-    Q_ASSERT(encryptionMode != Transport::EnumEncryption::SSL);
-    static const int tlsHandshakeStage = 42;
-
-    qCDebug(MAILTRANSPORT_LOG) << "Stage" << normalStage + 1 << ", Mode" << encryptionMode;
-
-    // If we are in stage 42, we just do the handshake for TLS encryption and
-    // then reset the stage to -1, so that all authentication modes and
-    // capabilities are queried again for TLS encryption (some servers have
-    // different authentication  methods in normal and in TLS mode).
-    if (normalStage == tlsHandshakeStage) {
-        Q_ASSERT(encryptionMode == Transport::EnumEncryption::TLS);
-        normalStage = -1;
-        normalSocket->startTLS();
-        return;
-    }
-
-    bool shouldStartTLS = false;
-    normalStage++;
-
-    // Handle the whole POP converstation separatly, it is very different from
-    // IMAP and SMTP
-    if (testProtocol == POP_PROTOCOL) {
-        if (handlePopConversation(normalSocket, encryptionMode, normalStage, text,
-                                  &shouldStartTLS)) {
-            return;
-        }
-    } else {
-        // Handle the SMTP/IMAP conversation here. We just send the EHLO command in
-        // sendInitialCapabilityQuery.
-        if (normalStage == 0) {
-            sendInitialCapabilityQuery(normalSocket);
-            return;
-        }
-
-        if (text.contains(QLatin1String("STARTTLS"), Qt::CaseInsensitive)) {
-            connectionResults << Transport::EnumEncryption::TLS;
-            shouldStartTLS = true;
-        }
-        handleSMTPIMAPResponse(encryptionMode, text);
-    }
-
-    // If we reach here, the normal authentication/capabilities query is completed.
-    // Now do the same for TLS.
-    normalSocketFinished = true;
-
-    // If the server announced that STARTTLS/STLS is available, we'll add TLS to the
-    // connection result, do the command and set the stage to 42 to start the handshake.
-    if (shouldStartTLS && encryptionMode == Transport::EnumEncryption::None) {
-        qCDebug(MAILTRANSPORT_LOG) << "Trying TLS...";
-        connectionResults << Transport::EnumEncryption::TLS;
-        if (testProtocol == POP_PROTOCOL) {
-            normalSocket->write(QStringLiteral("STLS"));
-        } else if (testProtocol == IMAP_PROTOCOL) {
-            normalSocket->write(QStringLiteral("2 STARTTLS"));
-        } else {
-            normalSocket->write(QStringLiteral("STARTTLS"));
-        }
-        encryptionMode = Transport::EnumEncryption::TLS;
-        normalStage = tlsHandshakeStage;
-        return;
-    }
-
-    // If we reach here, either the TLS authentication/capabilities query is finished
-    // or the server does not support the STARTTLS/STLS command.
-    tlsFinished = true;
-    finalResult();
-}
-
-void ServerTestPrivate::slotReadSecure(const QString &text)
-{
-    secureStage++;
-    if (testProtocol == POP_PROTOCOL) {
-        bool dummy;
-        if (handlePopConversation(secureSocket, Transport::EnumEncryption::SSL,
-                                  secureStage, text, &dummy)) {
-            return;
-        }
-    } else {
-        if (secureStage == 0) {
-            sendInitialCapabilityQuery(secureSocket);
-            return;
-        }
-        handleSMTPIMAPResponse(Transport::EnumEncryption::SSL, text);
-    }
-    secureSocketFinished = true;
-    finalResult();
-}
-
-void ServerTestPrivate::slotNormalNotPossible()
-{
-    normalSocketTimer->stop();
-    normalPossible = false;
-    normalSocketFinished = true;
-    tlsFinished = true;
-    finalResult();
-}
-
-void ServerTestPrivate::slotSslPossible()
-{
-    secureSocketTimer->stop();
-    connectionResults << Transport::EnumEncryption::SSL;
-}
-
-void ServerTestPrivate::slotSslNotPossible()
-{
-    secureSocketTimer->stop();
-    securePossible = false;
-    secureSocketFinished = true;
-    finalResult();
-}
-
-void ServerTestPrivate::slotUpdateProgress()
-{
-    if (testProgress) {
-        testProgress->setValue(testProgress->value() + 1);
-    }
-}
-
-//---------------------- end private class -----------------------//
-
-ServerTest::ServerTest(QObject *parent)
-    : QObject(parent), d(new ServerTestPrivate(this))
-{
-    d->normalSocketTimer = new QTimer(this);
-    d->normalSocketTimer->setSingleShot(true);
-    connect(d->normalSocketTimer, SIGNAL(timeout()), SLOT(slotNormalNotPossible()));
-
-    d->secureSocketTimer = new QTimer(this);
-    d->secureSocketTimer->setSingleShot(true);
-    connect(d->secureSocketTimer, SIGNAL(timeout()), SLOT(slotSslNotPossible()));
-
-    d->progressTimer = new QTimer(this);
-    connect(d->progressTimer, SIGNAL(timeout()), SLOT(slotUpdateProgress()));
-}
-
-ServerTest::~ServerTest()
-{
-    delete d;
-}
-
-void ServerTest::start()
-{
-    qCDebug(MAILTRANSPORT_LOG) << d;
-
-    d->connectionResults.clear();
-    d->authenticationResults.clear();
-    d->capabilityResults.clear();
-    d->popSupportsTLS = false;
-    d->normalStage = -1;
-    d->secureStage = -1;
-    d->encryptionMode = Transport::EnumEncryption::None;
-    d->normalPossible = true;
-    d->securePossible = true;
-
-    if (d->testProgress) {
-        d->testProgress->setMaximum(20);
-        d->testProgress->setValue(0);
-        d->testProgress->setTextVisible(true);
-        d->testProgress->show();
-        d->progressTimer->start(1000);
-    }
-
-    d->normalSocket = new MailTransport::Socket(this);
-    d->secureSocket = new MailTransport::Socket(this);
-    d->normalSocket->setObjectName(QStringLiteral("normal"));
-    d->normalSocket->setServer(d->server);
-    d->normalSocket->setProtocol(d->testProtocol);
-    if (d->testProtocol == IMAP_PROTOCOL) {
-        d->normalSocket->setPort(IMAP_PORT);
-        d->secureSocket->setPort(IMAPS_PORT);
-    } else if (d->testProtocol == SMTP_PROTOCOL) {
-        d->normalSocket->setPort(SMTP_PORT);
-        d->secureSocket->setPort(SMTPS_PORT);
-    } else if (d->testProtocol == POP_PROTOCOL) {
-        d->normalSocket->setPort(POP_PORT);
-        d->secureSocket->setPort(POPS_PORT);
-    }
-
-    if (d->customPorts.contains(Transport::EnumEncryption::None)) {
-        d->normalSocket->setPort(d->customPorts.value(Transport::EnumEncryption::None));
-    }
-    if (d->customPorts.contains(Transport::EnumEncryption::SSL)) {
-        d->secureSocket->setPort(d->customPorts.value(Transport::EnumEncryption::SSL));
-    }
-
-    connect(d->normalSocket, SIGNAL(connected()), SLOT(slotNormalPossible()));
-    connect(d->normalSocket, SIGNAL(failed()), SLOT(slotNormalNotPossible()));
-    connect(d->normalSocket, SIGNAL(data(QString)),
-            SLOT(slotReadNormal(QString)));
-    connect(d->normalSocket, SIGNAL(tlsDone()), SLOT(slotTlsDone()));
-    d->normalSocket->reconnect();
-    d->normalSocketTimer->start(10000);
-
-    if (d->secureSocket->port() > 0) {
-        d->secureSocket->setObjectName(QStringLiteral("secure"));
-        d->secureSocket->setServer(d->server);
-        d->secureSocket->setProtocol(d->testProtocol + QLatin1Char('s'));
-        d->secureSocket->setSecure(true);
-        connect(d->secureSocket, SIGNAL(connected()), SLOT(slotSslPossible()));
-        connect(d->secureSocket, SIGNAL(failed()), SLOT(slotSslNotPossible()));
-        connect(d->secureSocket, SIGNAL(data(QString)),
-                SLOT(slotReadSecure(QString)));
-        d->secureSocket->reconnect();
-        d->secureSocketTimer->start(10000);
-    } else {
-        d->slotSslNotPossible();
-    }
-}
-
-void ServerTest::setFakeHostname(const QString &fakeHostname)
-{
-    d->fakeHostname = fakeHostname;
-}
-
-QString ServerTest::fakeHostname() const
-{
-    return d->fakeHostname;
-}
-
-void ServerTest::setServer(const QString &server)
-{
-    d->server = server;
-}
-
-void ServerTest::setPort(Transport::EnumEncryption::type encryptionMode, uint port)
-{
-    Q_ASSERT(encryptionMode == Transport::EnumEncryption::None ||
-             encryptionMode == Transport::EnumEncryption::SSL);
-    d->customPorts.insert(encryptionMode, port);
-}
-
-void ServerTest::setProgressBar(QProgressBar *pb)
-{
-    d->testProgress = pb;
-}
-
-void ServerTest::setProtocol(const QString &protocol)
-{
-    d->testProtocol = protocol;
-    d->customPorts.clear();
-}
-
-QString ServerTest::protocol() const
-{
-    return d->testProtocol;
-}
-
-QString ServerTest::server() const
-{
-    return d->server;
-}
-
-int ServerTest::port(TransportBase::EnumEncryption::type encryptionMode) const
-{
-    Q_ASSERT(encryptionMode == Transport::EnumEncryption::None ||
-             encryptionMode == Transport::EnumEncryption::SSL);
-    if (d->customPorts.contains(encryptionMode)) {
-        return d->customPorts.value(static_cast<int>(encryptionMode));
-    } else {
-        return -1;
-    }
-}
-
-QProgressBar *ServerTest::progressBar() const
-{
-    return d->testProgress;
-}
-
-QList< int > ServerTest::normalProtocols() const
-{
-    return d->authenticationResults[TransportBase::EnumEncryption::None];
-}
-
-bool ServerTest::isNormalPossible() const
-{
-    return d->normalPossible;
-}
-
-QList< int > ServerTest::tlsProtocols() const
-{
-    return d->authenticationResults[TransportBase::EnumEncryption::TLS];
-}
-
-QList< int > ServerTest::secureProtocols() const
-{
-    return d->authenticationResults[Transport::EnumEncryption::SSL];
-}
-
-bool ServerTest::isSecurePossible() const
-{
-    return d->securePossible;
-}
-
-QList< ServerTest::Capability > ServerTest::capabilities() const
-{
-    return d->capabilityResults.toList();
-}
-
-#include "moc_servertest.cpp"
diff -Nru kmailtransport-16.12.3/src/servertest.h kmailtransport-17.04.3/src/servertest.h
--- kmailtransport-16.12.3/src/servertest.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/servertest.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,227 +0,0 @@
-/*
-  Copyright (C) 2007 KovoKs <info@kovoks.nl>
-  Copyright (c) 2008 Thomas McGuire <thomas.mcguire@gmx.net>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_SERVERTEST_H
-#define MAILTRANSPORT_SERVERTEST_H
-
-#include <mailtransport_export.h>
-#include <transport.h>
-
-#include <QObject>
-#include <QList>
-
-class QProgressBar;
-
-namespace MailTransport
-{
-
-class ServerTestPrivate;
-
-/**
- * @class ServerTest
- * This class can be used to test certain server to see if they support stuff.
- * @author Tom Albers <tomalbers@kde.nl>
- */
-class MAILTRANSPORT_EXPORT ServerTest : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QString server READ server WRITE setServer)
-    Q_PROPERTY(QString protocol READ protocol WRITE setProtocol)
-    Q_PROPERTY(QProgressBar *progressBar READ progressBar WRITE setProgressBar)
-
-public:
-
-    /**
-     * This enumeration has the special capabilities a server might
-     * support. This covers only capabilities not related to authentication.
-     * @since 4.1
-     */
-    enum Capability {
-        Pipelining, ///< POP3 only. The server supports pipeplining of commands
-        Top,        ///< POP3 only. The server supports fetching only the headers
-        UIDL        ///< POP3 only. The server has support for unique identifiers
-    };
-
-    /**
-     * Creates a new server test.
-     *
-     * @param parent The parent widget.
-     */
-    ServerTest(QObject *parent = Q_NULLPTR);
-
-    /**
-     * Destroys the server test.
-     */
-    ~ServerTest();
-
-    /**
-     * Sets the server to test.
-     */
-    void setServer(const QString &server);
-
-    /**
-     * Returns the server to test.
-     */
-    QString server() const;
-
-    /**
-     * Set a custom port to use.
-     *
-     * Each encryption mode (no encryption or SSL) has a different port.
-     * TLS uses the same port as no encryption, because TLS is invoked during
-     * a normal session.
-     *
-     * If this function is never called, the default port is used, which is:
-     * (normal first, then SSL)
-     * SMTP: 25, 465
-     * POP: 110, 995
-     * IMAP: 143, 993
-     *
-     * @param encryptionMode the port will only be used in this encryption mode.
-     *                       Valid values for this are only 'None' and 'SSL'.
-     * @param port the port to use
-     *
-     * @since 4.1
-     */
-    void setPort(Transport::EnumEncryption::type encryptionMode, uint port);
-
-    /**
-     * @param encryptionMode the port of this encryption mode is returned.
-     *                       Can only be 'None' and 'SSL'
-     *
-     * @return the port set by @ref setPort or -1 if @ref setPort() was never
-     *         called for this encryption mode.
-     *
-     * @since 4.1
-     */
-    int port(Transport::EnumEncryption::type encryptionMode) const;
-
-    /**
-     * Sets a fake hostname for the test. This is currently only used when
-     * testing a SMTP server; there, the command for testing the capabilities
-     * (called EHLO) needs to have the hostname of the client included.
-     * The user can however choose to send a fake hostname instead of the
-     * local hostname to work around various problems. This fake hostname needs
-     * to be set here.
-     *
-     * @param fakeHostname the fake hostname to send
-     */
-    void setFakeHostname(const QString &fakeHostname);
-
-    /**
-     * @return the fake hostname, as set before with @ref setFakeHostname
-     */
-    QString fakeHostname() const;
-
-    /**
-     * Makes @p pb the progressbar to use. This class will call show()
-     * and hide() and will count down. It does not take ownership of
-     * the progressbar.
-     */
-    void setProgressBar(QProgressBar *pb);
-
-    /**
-     * Returns the used progress bar.
-     */
-    QProgressBar *progressBar() const;
-
-    /**
-     * Sets @p protocol the protocol to test, currently supported are
-     * "smtp", "pop" and "imap".
-     */
-    void setProtocol(const QString &protocol);
-
-    /**
-     * Returns the protocol.
-     */
-    QString protocol() const;
-
-    /**
-     * Starts the test. Will emit finished() when done.
-     */
-    void start();
-
-    /**
-     * Get the protocols for the normal connections.. Call this only
-     * after the finished() signals has been sent.
-     * @return an enum of the type Transport::EnumAuthenticationType
-     */
-    QList<int> normalProtocols() const;
-
-    /**
-     * tells you if the normal server is available
-     * @since 4.5
-     */
-    bool isNormalPossible() const;
-
-    /**
-     * Get the protocols for the TLS connections. Call this only
-     * after the finished() signals has been sent.
-     * @return an enum of the type Transport::EnumAuthenticationType
-     * @since 4.1
-     */
-    QList<int> tlsProtocols() const;
-
-    /**
-     * Get the protocols for the SSL connections. Call this only
-     * after the finished() signals has been sent.
-     * @return an enum of the type Transport::EnumAuthenticationType
-     */
-    QList<int> secureProtocols() const;
-
-    /**
-     * tells you if the ssl server is available
-     * @since 4.5
-     */
-    bool isSecurePossible() const;
-
-    /**
-     * Get the special capabilities of the server.
-     * Call this only after the finished() signals has been sent.
-     *
-     * @return the list of special capabilities of the server.
-     * @since 4.1
-     */
-    QList<Capability> capabilities() const;
-
-Q_SIGNALS:
-    /**
-     * This will be emitted when the test is done. It will contain
-     * the values from the enum EnumEncryption which are possible.
-     */
-    void finished(const QList<int> &);
-
-private:
-    Q_DECLARE_PRIVATE(ServerTest)
-    ServerTestPrivate *const d;
-
-    Q_PRIVATE_SLOT(d, void slotNormalPossible())
-    Q_PRIVATE_SLOT(d, void slotTlsDone())
-    Q_PRIVATE_SLOT(d, void slotSslPossible())
-    Q_PRIVATE_SLOT(d, void slotReadNormal(const QString &text))
-    Q_PRIVATE_SLOT(d, void slotReadSecure(const QString &text))
-    Q_PRIVATE_SLOT(d, void slotNormalNotPossible())
-    Q_PRIVATE_SLOT(d, void slotSslNotPossible())
-    Q_PRIVATE_SLOT(d, void slotUpdateProgress())
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_SERVERTEST_H
diff -Nru kmailtransport-16.12.3/src/smtpconfigwidget.cpp kmailtransport-17.04.3/src/smtpconfigwidget.cpp
--- kmailtransport-16.12.3/src/smtpconfigwidget.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/smtpconfigwidget.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,345 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    Based on MailTransport code by:
-    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-    Copyright (c) 2007 KovoKs <kovoks@kovoks.nl>
-
-    Based on KMail code by:
-    Copyright (c) 2001-2002 Michael Haeckel <haeckel@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "smtpconfigwidget.h"
-#include "ui_smtpsettings.h"
-
-#include "transportconfigwidget_p.h"
-#include "transport.h"
-#include "transportmanager.h"
-#include "servertest.h"
-#include "mailtransport_defs.h"
-
-#include <QAbstractButton>
-#include <QButtonGroup>
-
-#include <KProtocolInfo>
-#include "mailtransport_debug.h"
-#include <KMessageBox>
-
-using namespace MailTransport;
-
-class MailTransport::SMTPConfigWidgetPrivate : public TransportConfigWidgetPrivate
-{
-public:
-    ::Ui::SMTPSettings ui;
-
-    ServerTest *serverTest;
-    QButtonGroup *encryptionGroup;
-
-    // detected authentication capabilities
-    QList<int> noEncCapa, sslCapa, tlsCapa;
-
-    bool serverTestFailed;
-
-    static void addAuthenticationItem(QComboBox *combo,
-                                      int authenticationType)
-    {
-        combo->addItem(Transport::authenticationTypeString(authenticationType),
-                       QVariant(authenticationType));
-    }
-
-    void resetAuthCapabilities()
-    {
-        noEncCapa.clear();
-        noEncCapa << Transport::EnumAuthenticationType::LOGIN
-                  << Transport::EnumAuthenticationType::PLAIN
-                  << Transport::EnumAuthenticationType::CRAM_MD5
-                  << Transport::EnumAuthenticationType::DIGEST_MD5
-                  << Transport::EnumAuthenticationType::NTLM
-                  << Transport::EnumAuthenticationType::GSSAPI;
-        sslCapa = tlsCapa = noEncCapa;
-        updateAuthCapbilities();
-
-    }
-
-    void updateAuthCapbilities()
-    {
-        if (serverTestFailed) {
-            return;
-        }
-
-        QList<int> capa = noEncCapa;
-        if (ui.encryptionSsl->isChecked()) {
-            capa = sslCapa;
-        } else if (ui.encryptionTls->isChecked()) {
-            capa = tlsCapa;
-        }
-
-        ui.authCombo->clear();
-        foreach (int authType, capa) {
-            addAuthenticationItem(ui.authCombo, authType);
-        }
-
-        if (transport->isValid()) {
-            const int idx = ui.authCombo->findData(transport->authenticationType());
-
-            if (idx != -1) {
-                ui.authCombo->setCurrentIndex(idx);
-            }
-        }
-
-        if (capa.isEmpty()) {
-            ui.noAuthPossible->setVisible(true);
-            ui.kcfg_requiresAuthentication->setChecked(false);
-            ui.kcfg_requiresAuthentication->setEnabled(false);
-            ui.kcfg_requiresAuthentication->setVisible(false);
-            ui.authCombo->setEnabled(false);
-            ui.authLabel->setEnabled(false);
-        } else {
-            ui.noAuthPossible->setVisible(false);
-            ui.kcfg_requiresAuthentication->setEnabled(true);
-            ui.kcfg_requiresAuthentication->setVisible(true);
-            ui.authCombo->setEnabled(true);
-            ui.authLabel->setEnabled(true);
-        }
-    }
-};
-
-SMTPConfigWidget::SMTPConfigWidget(Transport *transport, QWidget *parent)
-    : TransportConfigWidget(*new SMTPConfigWidgetPrivate, transport, parent)
-{
-    init();
-}
-
-static void checkHighestEnabledButton(QButtonGroup *group)
-{
-    Q_ASSERT(group);
-
-    for (int i = group->buttons().count() - 1; i >= 0; --i) {
-        QAbstractButton *b = group->buttons().at(i);
-        if (b && b->isEnabled()) {
-            b->animateClick();
-            return;
-        }
-    }
-}
-
-void SMTPConfigWidget::init()
-{
-    Q_D(SMTPConfigWidget);
-    d->serverTest = Q_NULLPTR;
-
-    connect(TransportManager::self(), &TransportManager::passwordsChanged, this, &SMTPConfigWidget::passwordsLoaded);
-
-    d->serverTestFailed = false;
-
-    d->ui.setupUi(this);
-    d->manager->addWidget(this);   // otherwise it doesn't find out about these widgets
-    d->manager->updateWidgets();
-
-    d->encryptionGroup = new QButtonGroup(this);
-    d->encryptionGroup->addButton(d->ui.encryptionNone, Transport::EnumEncryption::None);
-    d->encryptionGroup->addButton(d->ui.encryptionSsl, Transport::EnumEncryption::SSL);
-    d->encryptionGroup->addButton(d->ui.encryptionTls, Transport::EnumEncryption::TLS);
-
-    d->ui.encryptionNone->setChecked(d->transport->encryption() == Transport::EnumEncryption::None);
-    d->ui.encryptionSsl->setChecked(d->transport->encryption() == Transport::EnumEncryption::SSL);
-    d->ui.encryptionTls->setChecked(d->transport->encryption() == Transport::EnumEncryption::TLS);
-
-    d->resetAuthCapabilities();
-
-    if (KProtocolInfo::capabilities(SMTP_PROTOCOL).contains(QStringLiteral("SASL")) == 0) {
-        d->ui.authCombo->removeItem(d->ui.authCombo->findData(
-                                        Transport::EnumAuthenticationType::NTLM));
-        d->ui.authCombo->removeItem(d->ui.authCombo->findData(
-                                        Transport::EnumAuthenticationType::GSSAPI));
-    }
-
-    connect(d->ui.checkCapabilities, &QPushButton::clicked, this, &SMTPConfigWidget::checkSmtpCapabilities);
-    connect(d->ui.kcfg_host, &QLineEdit::textChanged, this, &SMTPConfigWidget::hostNameChanged);
-    connect(d->encryptionGroup, static_cast<void (QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked), this, &SMTPConfigWidget::encryptionChanged);
-    connect(d->ui.kcfg_requiresAuthentication, &QCheckBox::toggled, this, &SMTPConfigWidget::ensureValidAuthSelection);
-
-    if (!d->transport->isValid()) {
-        checkHighestEnabledButton(d->encryptionGroup);
-    }
-
-    // load the password
-    d->transport->updatePasswordState();
-    if (d->transport->isComplete()) {
-        d->ui.password->setText(d->transport->password());
-    } else {
-        if (d->transport->requiresAuthentication()) {
-            TransportManager::self()->loadPasswordsAsync();
-        }
-    }
-
-    hostNameChanged(d->transport->host());
-}
-
-void SMTPConfigWidget::checkSmtpCapabilities()
-{
-    Q_D(SMTPConfigWidget);
-
-    d->serverTest = new ServerTest(this);
-    d->serverTest->setProtocol(SMTP_PROTOCOL);
-    d->serverTest->setServer(d->ui.kcfg_host->text().trimmed());
-    if (d->ui.kcfg_specifyHostname->isChecked()) {
-        d->serverTest->setFakeHostname(d->ui.kcfg_localHostname->text());
-    }
-    QAbstractButton *encryptionChecked = d->encryptionGroup->checkedButton();
-    if (encryptionChecked == d->ui.encryptionNone) {
-        d->serverTest->setPort(Transport::EnumEncryption::None, d->ui.kcfg_port->value());
-    } else if (encryptionChecked == d->ui.encryptionSsl) {
-        d->serverTest->setPort(Transport::EnumEncryption::SSL, d->ui.kcfg_port->value());
-    }
-    d->serverTest->setProgressBar(d->ui.checkCapabilitiesProgress);
-    d->ui.checkCapabilitiesStack->setCurrentIndex(1);
-    qApp->setOverrideCursor(Qt::BusyCursor);
-
-    connect(d->serverTest, &ServerTest::finished, this, &SMTPConfigWidget::slotFinished);
-    connect(d->serverTest, &ServerTest::finished, qApp, [](){ qApp->restoreOverrideCursor(); });
-    d->ui.checkCapabilities->setEnabled(false);
-    d->serverTest->start();
-    d->serverTestFailed = false;
-}
-
-void SMTPConfigWidget::apply()
-{
-    Q_D(SMTPConfigWidget);
-    Q_ASSERT(d->manager);
-    d->manager->updateSettings();
-    d->transport->setPassword(d->ui.password->text());
-
-    KConfigGroup group(d->transport->config(), d->transport->currentGroup());
-    const int index = d->ui.authCombo->currentIndex();
-    if (index >= 0) {
-        group.writeEntry("authtype", d->ui.authCombo->itemData(index).toInt());
-    }
-
-    if (d->ui.encryptionNone->isChecked())
-        d->transport->setEncryption(Transport::EnumEncryption::None);
-    if (d->ui.encryptionSsl->isChecked())
-        d->transport->setEncryption(Transport::EnumEncryption::SSL);
-    if (d->ui.encryptionTls->isChecked())
-        d->transport->setEncryption(Transport::EnumEncryption::TLS);
-
-    TransportConfigWidget::apply();
-}
-
-void SMTPConfigWidget::passwordsLoaded()
-{
-    Q_D(SMTPConfigWidget);
-
-    // Load the password from the original to our cloned copy
-    d->transport->updatePasswordState();
-
-    if (d->ui.password->text().isEmpty()) {
-        d->ui.password->setText(d->transport->password());
-    }
-}
-
-// TODO rename
-void SMTPConfigWidget::slotFinished(const QList<int> &results)
-{
-    Q_D(SMTPConfigWidget);
-
-    d->ui.checkCapabilitiesStack->setCurrentIndex(0);
-
-    d->ui.checkCapabilities->setEnabled(true);
-    d->serverTest->deleteLater();
-
-    // If the servertest did not find any useable authentication modes, assume the
-    // connection failed and don't disable any of the radioboxes.
-    if (results.isEmpty()) {
-        KMessageBox::error(this, i18n("Failed to check capabilities. Please verify port and authentication mode."), i18n("Check Capabilities Failed"));
-        d->serverTestFailed = true;
-        d->serverTest->deleteLater();
-        return;
-    }
-
-    // encryption method
-    d->ui.encryptionNone->setEnabled(results.contains(Transport::EnumEncryption::None));
-    d->ui.encryptionSsl->setEnabled(results.contains(Transport::EnumEncryption::SSL));
-    d->ui.encryptionTls->setEnabled(results.contains(Transport::EnumEncryption::TLS));
-    checkHighestEnabledButton(d->encryptionGroup);
-
-    d->noEncCapa = d->serverTest->normalProtocols();
-    if (d->ui.encryptionTls->isEnabled()) {
-        d->tlsCapa = d->serverTest->tlsProtocols();
-    } else {
-        d->tlsCapa.clear();
-    }
-    d->sslCapa = d->serverTest->secureProtocols();
-    d->updateAuthCapbilities();
-    //Show correct port from capabilities.
-    if (d->ui.encryptionSsl->isEnabled()) {
-        const int portValue = d->serverTest->port(Transport::EnumEncryption::SSL);
-        d->ui.kcfg_port->setValue(portValue == -1 ? SMTPS_PORT : portValue);
-    } else if (d->ui.encryptionNone->isEnabled()) {
-        const int portValue = d->serverTest->port(Transport::EnumEncryption::None);
-        d->ui.kcfg_port->setValue(portValue == -1 ? SMTP_PORT : portValue);
-    }
-    d->serverTest->deleteLater();
-}
-
-void SMTPConfigWidget::hostNameChanged(const QString &text)
-{
-    // TODO: really? is this done at every change? wtf
-
-    Q_D(SMTPConfigWidget);
-
-    // sanitize hostname...
-    const int pos = d->ui.kcfg_host->cursorPosition();
-    d->ui.kcfg_host->blockSignals(true);
-    d->ui.kcfg_host->setText(text.trimmed());
-    d->ui.kcfg_host->blockSignals(false);
-    d->ui.kcfg_host->setCursorPosition(pos);
-
-    d->resetAuthCapabilities();
-    for (int i = 0; d->encryptionGroup && i < d->encryptionGroup->buttons().count(); ++i) {
-        d->encryptionGroup->buttons().at(i)->setEnabled(true);
-    }
-}
-
-void SMTPConfigWidget::ensureValidAuthSelection()
-{
-    Q_D(SMTPConfigWidget);
-
-    // adjust available authentication methods
-    d->updateAuthCapbilities();
-}
-
-void SMTPConfigWidget::encryptionChanged(int enc)
-{
-    Q_D(SMTPConfigWidget);
-    qCDebug(MAILTRANSPORT_LOG) << enc;
-
-    // adjust port
-    if (enc == Transport::EnumEncryption::SSL) {
-        if (d->ui.kcfg_port->value() == SMTP_PORT) {
-            d->ui.kcfg_port->setValue(SMTPS_PORT);
-        }
-    } else {
-        if (d->ui.kcfg_port->value() == SMTPS_PORT) {
-            d->ui.kcfg_port->setValue(SMTP_PORT);
-        }
-    }
-
-    ensureValidAuthSelection();
-}
-
diff -Nru kmailtransport-16.12.3/src/smtpconfigwidget.h kmailtransport-17.04.3/src/smtpconfigwidget.h
--- kmailtransport-16.12.3/src/smtpconfigwidget.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/smtpconfigwidget.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    Based on MailTransport code by:
-    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-
-    Based on KMail code by:
-    Copyright (c) 2001-2002 Michael Haeckel <haeckel@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_SMTPCONFIGWIDGET_H
-#define MAILTRANSPORT_SMTPCONFIGWIDGET_H
-
-#include "transportconfigwidget.h"
-
-namespace MailTransport
-{
-
-class Transport;
-
-/**
-  @internal
-*/
-class SMTPConfigWidgetPrivate;
-
-/**
-  @internal
-  Configuration widget for a SMTP transport.
-*/
-class SMTPConfigWidget : public TransportConfigWidget
-{
-    Q_OBJECT
-
-public:
-    explicit SMTPConfigWidget(Transport *transport, QWidget *parent = Q_NULLPTR);
-    //virtual ~SMTPConfigWidget();
-
-public Q_SLOTS:
-    /** reimpl */
-    void apply() Q_DECL_OVERRIDE;
-
-private Q_SLOTS:
-    void checkSmtpCapabilities();
-    void passwordsLoaded();
-    void slotFinished(const QList<int> &results);
-    void hostNameChanged(const QString &text);
-    void encryptionChanged(int enc);
-    void ensureValidAuthSelection();
-
-private:
-    Q_DECLARE_PRIVATE(SMTPConfigWidget)
-
-    void init();
-
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_SMTPCONFIGWIDGET_H
diff -Nru kmailtransport-16.12.3/src/smtpjob.cpp kmailtransport-17.04.3/src/smtpjob.cpp
--- kmailtransport-16.12.3/src/smtpjob.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/smtpjob.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,366 +0,0 @@
-/*
-  Copyright (c) 2007 Volker Krause <vkrause@kde.org>
-
-  Based on KMail code by:
-  Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#include "smtpjob.h"
-#include "transport.h"
-#include "mailtransport_defs.h"
-#include "precommandjob.h"
-
-#include <QBuffer>
-#include <QHash>
-#include <QPointer>
-
-#include <KLocalizedString>
-#include <QUrl>
-#include <QUrlQuery>
-#include "mailtransport_debug.h"
-#include <KIO/Job>
-#include <KIO/Scheduler>
-#include <KPasswordDialog>
-
-using namespace MailTransport;
-
-class SlavePool
-{
-public:
-    SlavePool() : ref(0) {}
-    int ref;
-    QHash<int, KIO::Slave *> slaves;
-
-    void removeSlave(KIO::Slave *slave, bool disconnect = false)
-    {
-        qCDebug(MAILTRANSPORT_LOG) << "Removing slave" << slave << "from pool";
-        const int slaveKey = slaves.key(slave);
-        if (slaveKey > 0) {
-            slaves.remove(slaveKey);
-            if (disconnect) {
-                KIO::Scheduler::disconnectSlave(slave);
-            }
-        }
-    }
-};
-
-Q_GLOBAL_STATIC(SlavePool, s_slavePool)
-
-/**
- * Private class that helps to provide binary compatibility between releases.
- * @internal
- */
-class SmtpJobPrivate
-{
-public:
-    SmtpJobPrivate(SmtpJob *parent) : q(parent) {}
-
-    void smtpSessionResult(SmtpSession *session)
-    {
-#ifndef MAILTRANSPORT_INPROCESS_SMTP
-        Q_UNUSED(session);
-#else
-        if (!session->errorMessage().isEmpty()) {
-            q->setError(KJob::UserDefinedError);
-            q->setErrorText(session->errorMessage());
-        }
-        q->emitResult();
-#endif
-    }
-
-    SmtpJob *q;
-    KIO::Slave *slave;
-    enum State {
-        Idle, Precommand, Smtp
-    } currentState;
-    bool finished;
-};
-
-SmtpJob::SmtpJob(Transport *transport, QObject *parent)
-    : TransportJob(transport, parent), d(new SmtpJobPrivate(this))
-{
-    d->currentState = SmtpJobPrivate::Idle;
-    d->slave = Q_NULLPTR;
-    d->finished = false;
-    if (!s_slavePool.isDestroyed()) {
-        s_slavePool->ref++;
-    }
-    KIO::Scheduler::connect(SIGNAL(slaveError(KIO::Slave*,int,QString)), this, SLOT(slaveError(KIO::Slave*,int,QString)));
-}
-
-SmtpJob::~SmtpJob()
-{
-    if (!s_slavePool.isDestroyed()) {
-        s_slavePool->ref--;
-        if (s_slavePool->ref == 0) {
-            qCDebug(MAILTRANSPORT_LOG) << "clearing SMTP slave pool" << s_slavePool->slaves.count();
-            foreach (KIO::Slave *slave, s_slavePool->slaves) {
-                if (slave) {
-                    KIO::Scheduler::disconnectSlave(slave);
-                }
-            }
-            s_slavePool->slaves.clear();
-        }
-    }
-    delete d;
-}
-
-void SmtpJob::doStart()
-{
-    if (s_slavePool.isDestroyed()) {
-        return;
-    }
-
-    if ((!s_slavePool->slaves.isEmpty() &&
-            s_slavePool->slaves.contains(transport()->id())) ||
-            transport()->precommand().isEmpty()) {
-        d->currentState = SmtpJobPrivate::Smtp;
-        startSmtpJob();
-    } else {
-        d->currentState = SmtpJobPrivate::Precommand;
-        PrecommandJob *job = new PrecommandJob(transport()->precommand(), this);
-        addSubjob(job);
-        job->start();
-    }
-}
-
-void SmtpJob::startSmtpJob()
-{
-    if (s_slavePool.isDestroyed()) {
-        return;
-    }
-
-    QUrl destination;
-    destination.setScheme((transport()->encryption() == Transport::EnumEncryption::SSL) ?
-                          SMTPS_PROTOCOL : SMTP_PROTOCOL);
-    destination.setHost(transport()->host().trimmed());
-    destination.setPort(transport()->port());
-
-    QUrlQuery destinationQuery(destination);
-    destinationQuery.addQueryItem(QStringLiteral("headers"), QStringLiteral("0"));
-    destinationQuery.addQueryItem(QStringLiteral("from"), sender());
-
-    foreach (const QString &str, to()) {
-        destinationQuery.addQueryItem(QStringLiteral("to"), str);
-    }
-    foreach (const QString &str, cc()) {
-        destinationQuery.addQueryItem(QStringLiteral("cc"), str);
-    }
-    foreach (const QString &str, bcc()) {
-        destinationQuery.addQueryItem(QStringLiteral("bcc"), str);
-    }
-
-    if (transport()->specifyHostname()) {
-        destinationQuery.addQueryItem(QStringLiteral("hostname"), transport()->localHostname());
-    }
-
-    if (transport()->requiresAuthentication()) {
-        QString user = transport()->userName();
-        QString passwd = transport()->password();
-        if ((user.isEmpty() || passwd.isEmpty()) &&
-                transport()->authenticationType() != Transport::EnumAuthenticationType::GSSAPI) {
-
-            QPointer<KPasswordDialog> dlg =
-                new KPasswordDialog(
-                Q_NULLPTR,
-                KPasswordDialog::ShowUsernameLine |
-                KPasswordDialog::ShowKeepPassword);
-            dlg->setPrompt(i18n("You need to supply a username and a password "
-                                "to use this SMTP server."));
-            dlg->setKeepPassword(transport()->storePassword());
-            dlg->addCommentLine(QString(), transport()->name());
-            dlg->setUsername(user);
-            dlg->setPassword(passwd);
-
-            bool gotIt = false;
-            if (dlg->exec()) {
-                transport()->setUserName(dlg->username());
-                transport()->setPassword(dlg->password());
-                transport()->setStorePassword(dlg->keepPassword());
-                transport()->save();
-                gotIt = true;
-            }
-            delete dlg;
-
-            if (!gotIt) {
-                setError(KilledJobError);
-                emitResult();
-                return;
-            }
-        }
-        destination.setUserName(transport()->userName());
-        destination.setPassword(transport()->password());
-    }
-
-    // dotstuffing is now done by the slave (see setting of metadata)
-    if (!data().isEmpty()) {
-        // allow +5% for subsequent LF->CRLF and dotstuffing (an average
-        // over 2G-lines gives an average line length of 42-43):
-        destinationQuery.addQueryItem(QStringLiteral("size"),
-                                 QString::number(qRound(data().length() * 1.05)));
-    }
-
-    destination.setPath(QStringLiteral("/send"));
-    destination.setQuery(destinationQuery);
-
-#ifndef MAILTRANSPORT_INPROCESS_SMTP
-    d->slave = s_slavePool->slaves.value(transport()->id());
-    if (!d->slave) {
-        KIO::MetaData slaveConfig;
-        slaveConfig.insert(QStringLiteral("tls"),
-                           (transport()->encryption() == Transport::EnumEncryption::TLS) ?
-                           QStringLiteral("on") : QStringLiteral("off"));
-        if (transport()->requiresAuthentication()) {
-            slaveConfig.insert(QStringLiteral("sasl"), transport()->authenticationTypeString());
-        }
-        d->slave = KIO::Scheduler::getConnectedSlave(destination, slaveConfig);
-        qCDebug(MAILTRANSPORT_LOG) << "Created new SMTP slave" << d->slave;
-        s_slavePool->slaves.insert(transport()->id(), d->slave);
-    } else {
-        qCDebug(MAILTRANSPORT_LOG) << "Re-using existing slave" << d->slave;
-    }
-
-    KIO::TransferJob *job = KIO::put(destination, -1, KIO::HideProgressInfo);
-    if (!d->slave || !job) {
-        setError(UserDefinedError);
-        setErrorText(i18n("Unable to create SMTP job."));
-        emitResult();
-        return;
-    }
-
-    job->addMetaData(QStringLiteral("lf2crlf+dotstuff"), QStringLiteral("slave"));
-    connect(job, &KIO::TransferJob::dataReq, this, &SmtpJob::dataRequest);
-
-    addSubjob(job);
-    KIO::Scheduler::assignJobToSlave(d->slave, job);
-#else
-    SmtpSession *session = new SmtpSession(this);
-    connect(session, SIGNAL(result(MailTransport::SmtpSession*)),
-            SLOT(smtpSessionResult(MailTransport::SmtpSession*)));
-    session->setUseTLS(transport()->encryption() == Transport::EnumEncryption::TLS);
-    if (transport()->requiresAuthentication()) {
-        session->setSaslMethod(transport()->authenticationTypeString());
-    }
-    session->sendMessage(destination, buffer());
-#endif
-
-    setTotalAmount(KJob::Bytes, data().length());
-}
-
-bool SmtpJob::doKill()
-{
-    if (s_slavePool.isDestroyed()) {
-        return false;
-    }
-
-    if (!hasSubjobs()) {
-        return true;
-    }
-    if (d->currentState == SmtpJobPrivate::Precommand) {
-        return subjobs().first()->kill();
-    } else if (d->currentState == SmtpJobPrivate::Smtp) {
-        KIO::SimpleJob *job = static_cast<KIO::SimpleJob *>(subjobs().first());
-        clearSubjobs();
-        KIO::Scheduler::cancelJob(job);
-        s_slavePool->removeSlave(d->slave);
-        return true;
-    }
-    return false;
-}
-
-void SmtpJob::slotResult(KJob *job)
-{
-    if (s_slavePool.isDestroyed()) {
-        return;
-    }
-
-    // The job has finished, so we don't care about any further errors. Set
-    // d->finished to true, so slaveError() knows about this and doesn't call
-    // emitResult() anymore.
-    // Sometimes, the SMTP slave emits more than one error
-    //
-    // The first error causes slotResult() to be called, but not slaveError(), since
-    // the scheduler doesn't emit errors for connected slaves.
-    //
-    // The second error then causes slaveError() to be called (as the slave is no
-    // longer connected), which does emitResult() a second time, which is invalid
-    // (and triggers an assert in KMail).
-    d->finished = true;
-
-    // Normally, calling TransportJob::slotResult() whould set the proper error code
-    // for error() via KComposite::slotResult(). However, we can't call that here,
-    // since that also emits the result signal.
-    // In KMail, when there are multiple mails in the outbox, KMail tries to send
-    // the next mail when it gets the result signal, which then would reuse the
-    // old broken slave from the slave pool if there was an error.
-    // To prevent that, we call TransportJob::slotResult() only after removing the
-    // slave from the pool and calculate the error code ourselves.
-    int errorCode = error();
-    if (!errorCode) {
-        errorCode = job->error();
-    }
-
-    if (errorCode && d->currentState == SmtpJobPrivate::Smtp) {
-        s_slavePool->removeSlave(d->slave, errorCode != KIO::ERR_SLAVE_DIED);
-        TransportJob::slotResult(job);
-        return;
-    }
-
-    TransportJob::slotResult(job);
-    if (!error() && d->currentState == SmtpJobPrivate::Precommand) {
-        d->currentState = SmtpJobPrivate::Smtp;
-        startSmtpJob();
-        return;
-    }
-    if (!error()) {
-        emitResult();
-    }
-}
-
-void SmtpJob::dataRequest(KIO::Job *job, QByteArray &data)
-{
-    if (s_slavePool.isDestroyed()) {
-        return;
-    }
-
-    Q_UNUSED(job);
-    Q_ASSERT(job);
-    if (buffer()->atEnd()) {
-        data.clear();
-    } else {
-        Q_ASSERT(buffer()->isOpen());
-        data = buffer()->read(32 * 1024);
-    }
-    setProcessedAmount(KJob::Bytes, buffer()->pos());
-}
-
-void SmtpJob::slaveError(KIO::Slave *slave, int errorCode, const QString &errorMsg)
-{
-    if (s_slavePool.isDestroyed()) {
-        return;
-    }
-
-    s_slavePool->removeSlave(slave, errorCode != KIO::ERR_SLAVE_DIED);
-    if (d->slave == slave && !d->finished) {
-        setError(errorCode);
-        setErrorText(KIO::buildErrorString(errorCode, errorMsg));
-        emitResult();
-    }
-}
-
-#include "moc_smtpjob.cpp"
diff -Nru kmailtransport-16.12.3/src/smtpjob.h kmailtransport-17.04.3/src/smtpjob.h
--- kmailtransport-16.12.3/src/smtpjob.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/smtpjob.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,91 +0,0 @@
-/*
-    Copyright (c) 2007 Volker Krause <vkrause@kde.org>
-
-    Based on KMail code by:
-    Copyright (c) 1996-1998 Stefan Taferner <taferner@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_SMTPJOB_H
-#define MAILTRANSPORT_SMTPJOB_H
-
-#include <transportjob.h>
-
-#include <mailtransport_export.h>
-
-namespace KIO
-{
-class Job;
-class Slave;
-}
-
-class SmtpJobPrivate;
-
-namespace MailTransport
-{
-
-class SmtpSession;
-
-/**
-  Mail transport job for SMTP.
-  Internally, all jobs for a specific transport are queued to use the same
-  KIO::Slave. This avoids multiple simultaneous connections to the server,
-  which is not always allowed. Also, re-using an already existing connection
-  avoids the login overhead and can improve performance.
-
-  Precommands are automatically executed, once per opening a connection to the
-  server (not necessarily once per message).
-*/
-class MAILTRANSPORT_EXPORT SmtpJob : public TransportJob
-{
-    Q_OBJECT
-public:
-    /**
-      Creates a SmtpJob.
-      @param transport The transport settings.
-      @param parent The parent object.
-    */
-    explicit SmtpJob(Transport *transport, QObject *parent = Q_NULLPTR);
-
-    /**
-      Deletes this job.
-    */
-    virtual ~SmtpJob();
-
-protected:
-    void doStart() Q_DECL_OVERRIDE;
-    bool doKill() Q_DECL_OVERRIDE;
-
-protected Q_SLOTS:
-    void slotResult(KJob *job) Q_DECL_OVERRIDE;
-    void slaveError(KIO::Slave *slave, int errorCode, const QString &errorMsg);
-
-private:
-    void startSmtpJob();
-
-private Q_SLOTS:
-    void dataRequest(KIO::Job *job, QByteArray &data);
-
-private:
-    friend class ::SmtpJobPrivate;
-    SmtpJobPrivate *const d;
-    Q_PRIVATE_SLOT(d, void smtpSessionResult(MailTransport::SmtpSession *))
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_SMTPJOB_H
diff -Nru kmailtransport-16.12.3/src/socket.cpp kmailtransport-17.04.3/src/socket.cpp
--- kmailtransport-16.12.3/src/socket.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/socket.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,234 +0,0 @@
-/*
-  Copyright (C) 2006-2007 KovoKs <info@kovoks.nl>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-// Uncomment the next line for full comm debug
-// #define comm_debug
-
-// Own
-#include "socket.h"
-
-// Qt
-#include <QByteArray>
-#include <QSslSocket>
-#include <QNetworkProxy>
-// KDE
-#include "mailtransport_debug.h"
-
-using namespace MailTransport;
-
-namespace MailTransport
-{
-
-class SocketPrivate
-{
-public:
-    SocketPrivate(Socket *s);
-    Socket             *const q;
-    QSslSocket         *socket;
-    QString             server;
-    QString             protocol;
-    int                 port;
-    bool                secure;
-
-    // slots
-    void slotConnected();
-    void slotStateChanged(QAbstractSocket::SocketState state);
-    void slotModeChanged(QSslSocket::SslMode  state);
-    void slotSocketRead();
-    void slotSslErrors(const QList<QSslError> &errors);
-
-private:
-    QString m_msg;
-};
-
-}
-
-SocketPrivate::SocketPrivate(Socket *s) :
-    q(s),
-    socket(Q_NULLPTR),
-    port(0),
-    secure(false)
-{
-}
-
-void SocketPrivate::slotConnected()
-{
-    qCDebug(MAILTRANSPORT_LOG);
-
-    if (!secure) {
-        qCDebug(MAILTRANSPORT_LOG) << "normal connect";
-        emit q->connected();
-    } else {
-        qCDebug(MAILTRANSPORT_LOG) << "encrypted connect";
-        socket->startClientEncryption();
-    }
-}
-
-void SocketPrivate::slotStateChanged(QAbstractSocket::SocketState state)
-{
-#ifdef comm_debug
-    qCDebug(MAILTRANSPORT_LOG) << "State is now:" << (int) state;
-#endif
-    if (state == QAbstractSocket::UnconnectedState) {
-        emit q->failed();
-    }
-}
-
-void SocketPrivate::slotModeChanged(QSslSocket::SslMode  state)
-{
-#ifdef comm_debug
-    qCDebug(MAILTRANSPORT_LOG) << "Mode is now:" << state;
-#endif
-    if (state == QSslSocket::SslClientMode) {
-        emit q->tlsDone();
-    }
-}
-
-void SocketPrivate::slotSocketRead()
-{
-    qCDebug(MAILTRANSPORT_LOG);
-
-    if (!socket) {
-        return;
-    }
-
-    m_msg += QLatin1String(socket->readAll());
-
-    if (!m_msg.endsWith(QLatin1Char('\n'))) {
-        return;
-    }
-
-#ifdef comm_debug
-    qCDebug(MAILTRANSPORT_LOG) << socket->isEncrypted() << m_msg.trimmed();
-#endif
-
-    emit q->data(m_msg);
-    m_msg.clear();
-}
-
-void SocketPrivate::slotSslErrors(const QList<QSslError> &)
-{
-    qCDebug(MAILTRANSPORT_LOG);
-    /* We can safely ignore the errors, we are only interested in the
-    capabilities. We're not sending auth info. */
-    socket->ignoreSslErrors();
-    emit q->connected();
-}
-
-// ------------------ end private ---------------------------//
-
-Socket::Socket(QObject *parent)
-    : QObject(parent), d(new SocketPrivate(this))
-{
-    qCDebug(MAILTRANSPORT_LOG);
-}
-
-Socket::~Socket()
-{
-    qCDebug(MAILTRANSPORT_LOG);
-    delete d;
-}
-
-void Socket::reconnect()
-{
-    qCDebug(MAILTRANSPORT_LOG) << "Connecting to:" << d->server <<  ":" <<  d->port;
-
-#ifdef comm_debug
-    // qCDebug(MAILTRANSPORT_LOG) << d->protocol;
-#endif
-
-    if (d->socket) {
-        return;
-    }
-    
-    d->socket = new QSslSocket(this);
-    d->socket->setProxy(QNetworkProxy::DefaultProxy);
-    d->socket->connectToHost(d->server, d->port);
-
-    d->socket->setProtocol(QSsl::AnyProtocol);
-
-    connect(d->socket, SIGNAL(stateChanged(QAbstractSocket::SocketState)),
-            SLOT(slotStateChanged(QAbstractSocket::SocketState)));
-    connect(d->socket, SIGNAL(modeChanged(QSslSocket::SslMode)),
-            SLOT(slotModeChanged(QSslSocket::SslMode)));
-    connect(d->socket, SIGNAL(connected()), SLOT(slotConnected()));
-    connect(d->socket, SIGNAL(readyRead()), SLOT(slotSocketRead()));
-    connect(d->socket, &QSslSocket::encrypted, this, &Socket::connected);
-    connect(d->socket, SIGNAL(sslErrors(QList<QSslError>)),
-            SLOT(slotSslErrors(QList<QSslError>)));
-}
-
-void Socket::write(const QString &text)
-{
-    // qCDebug(MAILTRANSPORT_LOG);
-    // Eat things in the queue when there is no connection. We need
-    // to get a connection first don't we...
-    if (!d->socket || !available()) {
-        return;
-    }
-
-    QByteArray cs = (text + QLatin1String("\r\n")).toLatin1();
-
-#ifdef comm_debug
-    qCDebug(MAILTRANSPORT_LOG) << "C   :" << cs;
-#endif
-
-    d->socket->write(cs.data(), cs.size());
-}
-
-bool Socket::available()
-{
-    // qCDebug(MAILTRANSPORT_LOG);
-    bool ok = d->socket && d->socket->state() == QAbstractSocket::ConnectedState;
-    return ok;
-}
-
-void Socket::startTLS()
-{
-    qCDebug(MAILTRANSPORT_LOG) << objectName();
-    d->socket->setProtocol(QSsl::TlsV1_0OrLater);
-    d->socket->startClientEncryption();
-}
-
-void Socket::setProtocol(const QString &proto)
-{
-    d->protocol = proto;
-}
-
-void Socket::setServer(const QString &server)
-{
-    d->server = server;
-}
-
-void Socket::setPort(int port)
-{
-    d->port = port;
-}
-
-int Socket::port() const
-{
-    return d->port;
-}
-
-void Socket::setSecure(bool what)
-{
-    d->secure = what;
-}
-
-#include "moc_socket.cpp"
diff -Nru kmailtransport-16.12.3/src/socket.h kmailtransport-17.04.3/src/socket.h
--- kmailtransport-16.12.3/src/socket.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/socket.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,138 +0,0 @@
-/*
-  Copyright (C) 2006-2007 KovoKs <info@kovoks.nl>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_SOCKET_H
-#define MAILTRANSPORT_SOCKET_H
-
-#include <mailtransport_export.h>
-
-#include <QtNetwork/QSslSocket>
-
-namespace MailTransport
-{
-
-class SocketPrivate;
-
-/**
- * @class Socket
- * Responsible for communicating with the server, it's designed to work
- * with the ServerTest class.
- * @author Tom Albers <tomalbers@kde.nl>
- */
-class Socket : public QObject
-{
-    Q_OBJECT
-
-public:
-
-    /**
-     * Contructor, it will not auto connect. Call reconnect() to connect to
-     * the parameters given.
-     * @param parent the parent
-     */
-    explicit Socket(QObject *parent);
-
-    /**
-     * Destructor
-     */
-    ~Socket();
-
-    /**
-     * Existing connection will be closed and a new connection will be
-     * made
-     */
-    virtual void reconnect();
-
-    /**
-     * Write @p text to the socket
-     */
-    virtual void write(const QString &text);
-
-    /**
-     * @return true when the connection is live and kicking
-     */
-    virtual bool available();
-
-    /**
-     * set the protocol to use
-     */
-    void setProtocol(const QString &proto);
-
-    /**
-     * set the server to use
-     */
-    void setServer(const QString &server);
-
-    /**
-     * set the port to use. If not specified, it will use the default
-     * belonging to the protocol.
-     */
-    void setPort(int port);
-
-    /**
-     * returns the used port.
-     */
-    int port() const;
-
-    /**
-     * this will be a secure connection
-     */
-    void setSecure(bool what);
-
-    /**
-     * If you want to start TLS encryption, call this. For example after the starttls command.
-     */
-    void startTLS();
-
-private:
-    Q_DECLARE_PRIVATE(Socket)
-    SocketPrivate *const d;
-
-    Q_PRIVATE_SLOT(d, void slotConnected())
-    Q_PRIVATE_SLOT(d, void slotStateChanged(QAbstractSocket::SocketState state))
-    Q_PRIVATE_SLOT(d, void slotModeChanged(QSslSocket::SslMode  state))
-    Q_PRIVATE_SLOT(d, void slotSocketRead())
-    Q_PRIVATE_SLOT(d, void slotSslErrors(const QList<QSslError> &errors))
-
-Q_SIGNALS:
-    /**
-     * emits the incoming data
-     */
-    void data(const QString &);
-
-    /**
-     * emitted when there is a connection (ready to send something).
-     */
-    void connected();
-
-    /**
-     * emitted when not connected.
-     */
-    void failed();
-
-    /**
-     * emitted when startShake() is completed.
-     */
-    void tlsDone();
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_SOCKET_H
-
diff -Nru kmailtransport-16.12.3/src/transportattribute.cpp kmailtransport-17.04.3/src/transportattribute.cpp
--- kmailtransport-16.12.3/src/transportattribute.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportattribute.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/*
-    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "transportattribute.h"
-
-#include "transportmanager.h"
-
-using namespace Akonadi;
-using namespace MailTransport;
-
-class TransportAttribute::Private
-{
-public:
-    int mId;
-};
-
-TransportAttribute::TransportAttribute(int id)
-    : d(new Private)
-{
-    d->mId = id;
-}
-
-TransportAttribute::~TransportAttribute()
-{
-    delete d;
-}
-
-TransportAttribute *TransportAttribute::clone() const
-{
-    return new TransportAttribute(d->mId);
-}
-
-QByteArray TransportAttribute::type() const
-{
-    static const QByteArray sType("TransportAttribute");
-    return sType;
-}
-
-QByteArray TransportAttribute::serialized() const
-{
-    return QByteArray::number(d->mId);
-}
-
-void TransportAttribute::deserialize(const QByteArray &data)
-{
-    d->mId = data.toInt();
-}
-
-int TransportAttribute::transportId() const
-{
-    return d->mId;
-}
-
-Transport *TransportAttribute::transport() const
-{
-    return TransportManager::self()->transportById(d->mId, false);
-}
-
-void TransportAttribute::setTransportId(int id)
-{
-    d->mId = id;
-}
-
diff -Nru kmailtransport-16.12.3/src/transportattribute.h kmailtransport-17.04.3/src/transportattribute.h
--- kmailtransport-16.12.3/src/transportattribute.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportattribute.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,85 +0,0 @@
-/*
-    Copyright 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_TRANSPORTATTRIBUTE_H
-#define MAILTRANSPORT_TRANSPORTATTRIBUTE_H
-
-#include <mailtransport_export.h>
-
-#include <attribute.h>
-
-namespace MailTransport
-{
-
-class Transport;
-
-/**
-  Attribute determining which transport to use for sending a message.
-
-  @see mailtransport
-  @see TransportManager.
-
-  @author Constantin Berzan <exit3219@gmail.com>
-  @since 4.4
-*/
-class MAILTRANSPORT_EXPORT TransportAttribute : public Akonadi::Attribute
-{
-public:
-    /**
-      Creates a new TransportAttribute.
-    */
-    explicit TransportAttribute(int id = -1);
-
-    /**
-      Destroys this TransportAttribute.
-    */
-    virtual ~TransportAttribute();
-
-    /* reimpl */
-    TransportAttribute *clone() const Q_DECL_OVERRIDE;
-    QByteArray type() const Q_DECL_OVERRIDE;
-    QByteArray serialized() const Q_DECL_OVERRIDE;
-    void deserialize(const QByteArray &data) Q_DECL_OVERRIDE;
-
-    /**
-      Returns the transport id to use for sending this message.
-      @see TransportManager.
-    */
-    int transportId() const;
-
-    /**
-      Returns the transport object corresponding to the transport id contained
-      in this attribute.
-      @see Transport.
-    */
-    Transport *transport() const;
-    /**
-      Sets the transport id to use for sending this message.
-    */
-    void setTransportId(int id);
-
-private:
-    class Private;
-    Private *const d;
-
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_TRANSPORTATTRIBUTE_H
diff -Nru kmailtransport-16.12.3/src/transportbase.kcfgc kmailtransport-17.04.3/src/transportbase.kcfgc
--- kmailtransport-16.12.3/src/transportbase.kcfgc	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportbase.kcfgc	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-File=mailtransport.kcfg
-ClassName=TransportBase
-NameSpace=MailTransport
-Mutators=true
-ItemAccessors=true
-SetUserTexts=true
-Visibility=MAILTRANSPORT_EXPORT
-IncludeFiles=mailtransport_export.h,KLocalizedString
-TranslationDomain=libmailtransport5
diff -Nru kmailtransport-16.12.3/src/transportcombobox.cpp kmailtransport-17.04.3/src/transportcombobox.cpp
--- kmailtransport-16.12.3/src/transportcombobox.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportcombobox.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,94 +0,0 @@
-/*
-    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "transportcombobox.h"
-#include "transport.h"
-#include "transportmanager.h"
-
-using namespace MailTransport;
-
-/**
- * Private class that helps to provide binary compatibility between releases.
- * @internal
- */
-class TransportComboBoxPrivate
-{
-public:
-    QList<int> transports;
-};
-
-TransportComboBox::TransportComboBox(QWidget *parent)
-    : QComboBox(parent), d(new TransportComboBoxPrivate)
-{
-    QMetaObject::invokeMethod(this, "updateComboboxList");
-    connect(TransportManager::self(), &TransportManager::transportsChanged, this, &TransportComboBox::updateComboboxList);
-}
-
-TransportComboBox::~TransportComboBox()
-{
-    delete d;
-}
-
-int TransportComboBox::currentTransportId() const
-{
-    if (currentIndex() >= 0 && currentIndex() < d->transports.count()) {
-        return d->transports.at(currentIndex());
-    }
-    return -1;
-}
-
-void TransportComboBox::setCurrentTransport(int transportId)
-{
-    const int i = d->transports.indexOf(transportId);
-    if (i >= 0 && i < count()) {
-        setCurrentIndex(i);
-    }
-}
-
-TransportBase::EnumType::type TransportComboBox::transportType() const
-{
-    int transtype = TransportManager::self()->transportById(currentTransportId())->type();
-    return static_cast<TransportBase::EnumType::type>(transtype);
-}
-
-void TransportComboBox::updateComboboxList()
-{
-    const int oldTransport = currentTransportId();
-    clear();
-
-    int defaultId = 0;
-    if (!TransportManager::self()->isEmpty()) {
-        const QStringList listNames = TransportManager::self()->transportNames();
-        const QList<int> listIds = TransportManager::self()->transportIds();
-        addItems(listNames);
-        setTransportList(listIds);
-        defaultId = TransportManager::self()->defaultTransportId();
-    }
-
-    if (oldTransport != -1) {
-        setCurrentTransport(oldTransport);
-    } else {
-        setCurrentTransport(defaultId);
-    }
-}
-
-void TransportComboBox::setTransportList(const QList<int> &transportList)
-{
-    d->transports = transportList;
-}
diff -Nru kmailtransport-16.12.3/src/transportcombobox.h kmailtransport-17.04.3/src/transportcombobox.h
--- kmailtransport-16.12.3/src/transportcombobox.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportcombobox.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-/*
-  Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_TRANSPORTCOMBOBOX_H
-#define MAILTRANSPORT_TRANSPORTCOMBOBOX_H
-
-#include <mailtransport_export.h>
-#include <transportbase.h>
-
-#include <QComboBox>
-
-class TransportComboBoxPrivate;
-
-namespace MailTransport
-{
-
-/**
-  A combo-box for selecting a mail transport.
-  It is updated automatically when transports are added, changed, or removed.
-*/
-class MAILTRANSPORT_EXPORT TransportComboBox : public QComboBox
-{
-    Q_OBJECT
-
-public:
-    /**
-      Creates a new mail transport selection combo box.
-      @param parent The paren widget.
-    */
-    TransportComboBox(QWidget *parent = Q_NULLPTR);
-
-    ~TransportComboBox();
-
-    /**
-      Returns identifier of the currently selected mail transport.
-    */
-    int currentTransportId() const;
-
-    /**
-      Selects the given transport.
-      @param transportId The transport identifier.
-    */
-    void setCurrentTransport(int transportId);
-
-    /**
-      Returns the type of the selected transport.
-    */
-    TransportBase::EnumType::type transportType() const;
-
-protected:
-    void setTransportList(const QList<int> &transportList);
-
-public Q_SLOTS:
-    /**
-     * @since 4.11
-     */
-    void updateComboboxList();
-
-private:
-    TransportComboBoxPrivate *const d;
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_TRANSPORTCOMBOBOX_H
diff -Nru kmailtransport-16.12.3/src/transportconfigdialog.cpp kmailtransport-17.04.3/src/transportconfigdialog.cpp
--- kmailtransport-16.12.3/src/transportconfigdialog.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportconfigdialog.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,123 +0,0 @@
-/*
-  Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-  Copyright (c) 2007 KovoKs <kovoks@kovoks.nl>
-  Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-  Based on KMail code by:
-  Copyright (c) 2001-2002 Michael Haeckel <haeckel@kde.org>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#include "transportconfigdialog.h"
-#include "transport.h"
-#include "transportconfigwidget.h"
-#include "transportmanager.h"
-#include "transporttype.h"
-#include "smtpconfigwidget.h"
-
-#include <QDialogButtonBox>
-#include <QLabel>
-#include <QString>
-#include <QVBoxLayout>
-#include <QPushButton>
-
-#include "mailtransport_debug.h"
-#include <KLocalizedString>
-
-using namespace MailTransport;
-
-class MailTransport::TransportConfigDialog::Private
-{
-public:
-    Private(TransportConfigDialog *qq)
-        : transport(Q_NULLPTR), configWidget(Q_NULLPTR), q(qq), okButton(Q_NULLPTR)
-    {
-    }
-
-    Transport *transport;
-    QWidget *configWidget;
-    TransportConfigDialog *q;
-    QPushButton *okButton;
-
-    // slots
-    void okClicked();
-    void slotTextChanged(const QString &text);
-    void slotEnabledOkButton(bool);
-};
-
-void TransportConfigDialog::Private::slotEnabledOkButton(bool b)
-{
-    okButton->setEnabled(b);
-}
-
-void TransportConfigDialog::Private::okClicked()
-{
-    if (TransportConfigWidget *w = dynamic_cast<TransportConfigWidget *>(configWidget)) {
-        // It is not an Akonadi transport.
-        w->apply();
-        transport->save();
-    }
-}
-
-void TransportConfigDialog::Private::slotTextChanged(const QString &text)
-{
-    okButton->setEnabled(!text.isEmpty());
-}
-
-TransportConfigDialog::TransportConfigDialog(Transport *transport, QWidget *parent)
-    : QDialog(parent), d(new Private(this))
-{
-    Q_ASSERT(transport);
-    d->transport = transport;
-    QVBoxLayout *mainLayout = new QVBoxLayout(this);
-    bool pathIsEmpty = false;
-    switch (transport->type()) {
-    case Transport::EnumType::SMTP: {
-        d->configWidget = new SMTPConfigWidget(transport, this);
-        break;
-    }
-    case Transport::EnumType::Akonadi: {
-        qCWarning(MAILTRANSPORT_LOG) << "Tried to configure an Akonadi transport.";
-        d->configWidget = new QLabel(i18n("This outgoing account cannot be configured."), this);
-        break;
-    }
-    default: {
-        Q_ASSERT(false);
-        d->configWidget = Q_NULLPTR;
-        break;
-    }
-    }
-    mainLayout->addWidget(d->configWidget);
-    QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this);
-    d->okButton = buttonBox->button(QDialogButtonBox::Ok);
-    d->okButton->setEnabled(false);
-    d->okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
-    mainLayout->addWidget(buttonBox);
-
-    connect(d->okButton, SIGNAL(clicked()), this, SLOT(okClicked()));
-    connect(buttonBox, &QDialogButtonBox::accepted, this, &TransportConfigDialog::accept);
-    connect(buttonBox, &QDialogButtonBox::rejected, this, &TransportConfigDialog::reject);
-
-    d->okButton->setEnabled(!pathIsEmpty);
-}
-
-TransportConfigDialog::~TransportConfigDialog()
-{
-    delete d;
-}
-
-#include "moc_transportconfigdialog.cpp"
diff -Nru kmailtransport-16.12.3/src/transportconfigdialog.h kmailtransport-17.04.3/src/transportconfigdialog.h
--- kmailtransport-16.12.3/src/transportconfigdialog.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportconfigdialog.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,79 +0,0 @@
-/*
-    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    Based on KMail code by:
-    Copyright (c) 2001-2002 Michael Haeckel <haeckel@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_TRANSPORTCONFIGDIALOG_H
-#define MAILTRANSPORT_TRANSPORTCONFIGDIALOG_H
-
-#include <mailtransport_export.h>
-
-#include <QDialog>
-
-namespace MailTransport
-{
-
-class Transport;
-
-/**
- * @short Configuration dialog for a mail transport.
- */
-class TransportConfigDialog : public QDialog
-{
-    Q_OBJECT
-
-public:
-    /**
-     * Creates a new mail transport configuration dialog for the given
-     * Transport object.
-     * The config dialog does not delete @p transport, you have to delete it
-     * yourself.
-     *
-     * Note that this class only works for transports that are handled directly
-     * by MailTransport, i.e. SMTP.  This class cannot be used to
-     * configure an Akonadi transport.
-     *
-     * @param transport The Transport object to configure. This must be a deep
-     * copy of a Transport object or a newly created one, which hasn't been
-     * added to the TransportManager yet.
-     * @param parent The parent widget.
-     */
-    explicit TransportConfigDialog(Transport *transport, QWidget *parent = Q_NULLPTR);
-
-    /**
-     * Destroys the transport config dialog.
-     */
-    virtual ~TransportConfigDialog();
-
-private:
-    //@cond PRIVATE
-    class Private;
-    Private *const d;
-
-    Q_PRIVATE_SLOT(d, void okClicked())
-    Q_PRIVATE_SLOT(d, void slotTextChanged(const QString &))
-    Q_PRIVATE_SLOT(d, void slotEnabledOkButton(bool))
-    //@endcond
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_TRANSPORTCONFIGDIALOG_H
diff -Nru kmailtransport-16.12.3/src/transportconfigwidget.cpp kmailtransport-17.04.3/src/transportconfigwidget.cpp
--- kmailtransport-16.12.3/src/transportconfigwidget.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportconfigwidget.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,81 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    Based on MailTransport code by:
-    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-    Copyright (c) 2007 KovoKs <kovoks@kovoks.nl>
-
-    Based on KMail code by:
-    Copyright (c) 2001-2002 Michael Haeckel <haeckel@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "transportconfigwidget.h"
-#include "transportconfigwidget_p.h"
-#include "transport.h"
-#include "transportmanager.h"
-
-#include <KConfigDialogManager>
-#include "mailtransport_debug.h"
-
-using namespace MailTransport;
-
-TransportConfigWidget::TransportConfigWidget(Transport *transport, QWidget *parent)
-    : QWidget(parent), d_ptr(new TransportConfigWidgetPrivate)
-{
-    init(transport);
-}
-
-TransportConfigWidget::TransportConfigWidget(TransportConfigWidgetPrivate &dd,
-        Transport *transport, QWidget *parent)
-    : QWidget(parent), d_ptr(&dd)
-{
-    init(transport);
-}
-
-TransportConfigWidget::~ TransportConfigWidget()
-{
-    delete d_ptr;
-}
-
-void TransportConfigWidget::init(Transport *transport)
-{
-    Q_D(TransportConfigWidget);
-    qCDebug(MAILTRANSPORT_LOG) << "this" << this << "d" << d;
-    Q_ASSERT(transport);
-    d->transport = transport;
-
-    d->manager = new KConfigDialogManager(this, transport);
-    //d->manager->updateWidgets(); // no-op; ui is set up in subclasses.
-}
-
-KConfigDialogManager *TransportConfigWidget::configManager() const
-{
-    Q_D(const TransportConfigWidget);
-    Q_ASSERT(d->manager);
-    return d->manager;
-}
-
-void TransportConfigWidget::apply()
-{
-    Q_D(TransportConfigWidget);
-    d->manager->updateSettings();
-    d->transport->forceUniqueName();
-    d->transport->save();
-    qCDebug(MAILTRANSPORT_LOG) << "Config written.";
-}
-
diff -Nru kmailtransport-16.12.3/src/transportconfigwidget.h kmailtransport-17.04.3/src/transportconfigwidget.h
--- kmailtransport-16.12.3/src/transportconfigwidget.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportconfigwidget.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,108 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    Based on MailTransport code by:
-    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-
-    Based on KMail code by:
-    Copyright (c) 2001-2002 Michael Haeckel <haeckel@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_TRANSPORTCONFIGWIDGET_H
-#define MAILTRANSPORT_TRANSPORTCONFIGWIDGET_H
-
-#include <QWidget>
-
-class KConfigDialogManager;
-
-namespace MailTransport
-{
-
-class Transport;
-class TransportConfigWidgetPrivate;
-
-/**
-  @internal
-
-  Abstract configuration widget for a mail transport.  It makes sure that
-  the configured transport has a unique name, and takes care of writing its
-  settings to the config file.  If it is a new transport, the caller must
-  still call TransportManager::addTransport() to register the transport.
-
-  Concrete configuration is done in subclasses SMTPConfigWidget.
-  Akonadi-type transports are not configured by MailTransport directly,
-  instead the configure() method of their agent instance is called.
-
-  To configure a transport from applications, use
-  TransportManager::configureTransport().  You still need to call
-  TransportManager::addTransport() if this is a new transport, not registered
-  with TransportManager.
-
-  @author Constantin Berzan <exit3219@gmail.com>
-  @since 4.4
-*/
-class TransportConfigWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    /**
-      Creates a new mail transport configuration widget for the given
-      Transport object.
-      @param transport The Transport object to configure.
-      @param parent The parent widget.
-    */
-    explicit TransportConfigWidget(Transport *transport, QWidget *parent = Q_NULLPTR);
-
-    /**
-      Destroys the widget.
-    */
-    virtual ~TransportConfigWidget();
-
-    /**
-      @internal
-      Get the KConfigDialogManager for this widget.
-    */
-    KConfigDialogManager *configManager() const;
-
-public Q_SLOTS:
-    /**
-      Saves the transport's settings.
-
-      The base implementation writes the settings to the config file and makes
-      sure the transport has a unique name.  Reimplement in derived classes to
-      save your custom settings, and call the base implementation.
-    */
-    // TODO: do we also want to check for invalid settings?
-    virtual void apply();
-
-protected:
-    TransportConfigWidgetPrivate *const d_ptr;
-    TransportConfigWidget(TransportConfigWidgetPrivate &dd,
-                          Transport *transport, QWidget *parent);
-
-private:
-    Q_DECLARE_PRIVATE(TransportConfigWidget)
-
-    void init(Transport *transport);
-
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_TRANSPORTCONFIGWIDGET_H
diff -Nru kmailtransport-16.12.3/src/transportconfigwidget_p.h kmailtransport-17.04.3/src/transportconfigwidget_p.h
--- kmailtransport-16.12.3/src/transportconfigwidget_p.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportconfigwidget_p.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,47 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_TRANSPORTCONFIGWIDGET_P_H
-#define MAILTRANSPORT_TRANSPORTCONFIGWIDGET_P_H
-
-#include "transport.h"
-
-#include <KConfigDialogManager>
-
-namespace MailTransport
-{
-
-/**
-  @internal
-*/
-class TransportConfigWidgetPrivate
-{
-public:
-    Transport *transport;
-    KConfigDialogManager *manager;
-
-    virtual ~TransportConfigWidgetPrivate()
-    {
-    }
-
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_TRANSPORTCONFIGWIDGET_P_H
diff -Nru kmailtransport-16.12.3/src/transport.cpp kmailtransport-17.04.3/src/transport.cpp
--- kmailtransport-16.12.3/src/transport.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transport.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,357 +0,0 @@
-/*
-    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "transport.h"
-#include "transport_p.h"
-#include "legacydecrypt.h"
-#include "mailtransport_defs.h"
-#include "transportmanager.h"
-#include "transporttype_p.h"
-
-#include <QTimer>
-
-#include <KConfigGroup>
-#include "mailtransport_debug.h"
-#include <KLocalizedString>
-#include <KMessageBox>
-#include <KStringHandler>
-#include <KWallet/KWallet>
-
-#include <agentinstance.h>
-#include <agentmanager.h>
-
-using namespace MailTransport;
-using namespace KWallet;
-
-Transport::Transport(const QString &cfgGroup) :
-    TransportBase(cfgGroup), d(new TransportPrivate)
-{
-    qCDebug(MAILTRANSPORT_LOG) << cfgGroup;
-    d->passwordLoaded = false;
-    d->passwordDirty = false;
-    d->storePasswordInFile = false;
-    d->needsWalletMigration = false;
-    d->passwordNeedsUpdateFromWallet = false;
-    load();
-}
-
-Transport::~Transport()
-{
-    delete d;
-}
-
-bool Transport::isValid() const
-{
-    return (id() > 0) && !host().isEmpty() && port() <= 65536;
-}
-
-QString Transport::password()
-{
-    if (!d->passwordLoaded && requiresAuthentication() && storePassword() &&
-            d->password.isEmpty()) {
-        readPassword();
-    }
-    return d->password;
-}
-
-void Transport::setPassword(const QString &passwd)
-{
-    d->passwordLoaded = true;
-    if (d->password == passwd) {
-        return;
-    }
-    d->passwordDirty = true;
-    d->password = passwd;
-}
-
-void Transport::forceUniqueName()
-{
-    QStringList existingNames;
-    foreach (Transport *t, TransportManager::self()->transports()) {
-        if (t->id() != id()) {
-            existingNames << t->name();
-        }
-    }
-    int suffix = 1;
-    QString origName = name();
-    while (existingNames.contains(name())) {
-        setName(i18nc("%1: name; %2: number appended to it to make "
-                      "it unique among a list of names", "%1 #%2", origName, suffix));
-        ++suffix;
-    }
-
-}
-
-void Transport::updatePasswordState()
-{
-    Transport *original = TransportManager::self()->transportById(id(), false);
-    if (original == this) {
-        qCWarning(MAILTRANSPORT_LOG) << "Tried to update password state of non-cloned transport.";
-        return;
-    }
-    if (original) {
-        d->password = original->d->password;
-        d->passwordLoaded = original->d->passwordLoaded;
-        d->passwordDirty = original->d->passwordDirty;
-    } else {
-        qCWarning(MAILTRANSPORT_LOG) << "Transport with this ID not managed by transport manager.";
-    }
-}
-
-bool Transport::isComplete() const
-{
-    return !requiresAuthentication() || !storePassword() || d->passwordLoaded;
-}
-
-QString Transport::authenticationTypeString() const
-{
-    return Transport::authenticationTypeString(authenticationType());
-}
-
-QString Transport::authenticationTypeString(int type)
-{
-    switch (type) {
-    case EnumAuthenticationType::LOGIN:
-        return QStringLiteral("LOGIN");
-    case EnumAuthenticationType::PLAIN:
-        return QStringLiteral("PLAIN");
-    case EnumAuthenticationType::CRAM_MD5:
-        return QStringLiteral("CRAM-MD5");
-    case EnumAuthenticationType::DIGEST_MD5:
-        return QStringLiteral("DIGEST-MD5");
-    case EnumAuthenticationType::NTLM:
-        return QStringLiteral("NTLM");
-    case EnumAuthenticationType::GSSAPI:
-        return QStringLiteral("GSSAPI");
-    case EnumAuthenticationType::CLEAR:
-        return i18nc("Authentication method", "Clear text");
-    case EnumAuthenticationType::APOP:
-        return QStringLiteral("APOP");
-    case EnumAuthenticationType::ANONYMOUS:
-        return i18nc("Authentication method", "Anonymous");
-    }
-    Q_ASSERT(false);
-    return QString();
-}
-
-void Transport::usrRead()
-{
-    TransportBase::usrRead();
-
-    setHost(host().trimmed());
-
-    if (d->oldName.isEmpty()) {
-        d->oldName = name();
-    }
-
-    // Set TransportType.
-    {
-        using namespace Akonadi;
-        d->transportType = TransportType();
-        d->transportType.d->mType = type();
-        qCDebug(MAILTRANSPORT_LOG) << "type" << type();
-        if (type() == EnumType::Akonadi) {
-            const AgentInstance instance = AgentManager::self()->instance(host());
-            if (!instance.isValid()) {
-                qCWarning(MAILTRANSPORT_LOG) << "Akonadi transport with invalid resource instance.";
-            }
-            d->transportType.d->mAgentType = instance.type();
-            qCDebug(MAILTRANSPORT_LOG) << "agent type" << instance.type().name() << "id" << instance.type().identifier();
-        }
-        // Now we have the type and possibly agentType.  Get the name, description
-        // etc. from TransportManager.
-        const TransportType::List &types = TransportManager::self()->types();
-        int index = types.indexOf(d->transportType);
-        if (index != -1) {
-            d->transportType = types[ index ];
-        } else {
-            qCWarning(MAILTRANSPORT_LOG) << "Type unknown to manager.";
-            d->transportType.d->mName = i18nc("An unknown transport type", "Unknown");
-        }
-    }
-
-    // we have everything we need
-    if (!storePassword()) {
-        return;
-    }
-
-    if (d->passwordLoaded) {
-        if (d->passwordNeedsUpdateFromWallet) {
-            d->passwordNeedsUpdateFromWallet = false;
-            // read password if wallet is open, defer otherwise
-            if (Wallet::isOpen(Wallet::NetworkWallet())) {
-                // Don't read the password right away because this can lead
-                // to reentrancy problems in KDBusServiceStarter when an application
-                // run in Kontact creates the transports (due to a QEventLoop in the
-                // synchronous KWallet openWallet call).
-                QTimer::singleShot(0, this, &Transport::readPassword);
-            } else {
-                d->passwordLoaded = false;
-            }
-        }
-
-        return;
-    }
-
-    // try to find a password in the config file otherwise
-    KConfigGroup group(config(), currentGroup());
-    if (group.hasKey("password")) {
-        d->password = KStringHandler::obscure(group.readEntry("password"));
-    } else if (group.hasKey("password-kmail")) {
-        d->password = Legacy::decryptKMail(group.readEntry("password-kmail"));
-    }
-
-    if (!d->password.isEmpty()) {
-        d->passwordLoaded = true;
-        if (Wallet::isEnabled()) {
-            d->needsWalletMigration = true;
-        } else {
-            d->storePasswordInFile = true;
-        }
-    }
-}
-
-bool Transport::usrSave()
-{
-    if (requiresAuthentication() && storePassword() && d->passwordDirty) {
-        const QString storePassword = d->password;
-        Wallet *wallet = TransportManager::self()->wallet();
-        if (!wallet || wallet->writePassword(QString::number(id()), d->password) != 0) {
-            // wallet saving failed, ask if we should store in the config file instead
-            if (d->storePasswordInFile || KMessageBox::warningYesNo(
-                        Q_NULLPTR,
-                        i18n("KWallet is not available. It is strongly recommended to use "
-                             "KWallet for managing your passwords.\n"
-                             "However, the password can be stored in the configuration "
-                             "file instead. The password is stored in an obfuscated format, "
-                             "but should not be considered secure from decryption efforts "
-                             "if access to the configuration file is obtained.\n"
-                             "Do you want to store the password for server '%1' in the "
-                             "configuration file?", name()),
-                        i18n("KWallet Not Available"),
-                        KGuiItem(i18n("Store Password")),
-                        KGuiItem(i18n("Do Not Store Password"))) == KMessageBox::Yes) {
-                // write to config file
-                KConfigGroup group(config(), currentGroup());
-                group.writeEntry("password", KStringHandler::obscure(storePassword));
-                d->storePasswordInFile = true;
-            }
-        }
-        d->passwordDirty = false;
-    }
-
-    if (!TransportBase::usrSave()) {
-        return false;
-    }
-    TransportManager::self()->emitChangesCommitted();
-    if (name() != d->oldName) {
-        emit TransportManager::self()->transportRenamed(id(), d->oldName, name());
-        d->oldName = name();
-    }
-
-    return true;
-}
-
-void Transport::readPassword()
-{
-    // no need to load a password if the account doesn't require auth
-    if (!requiresAuthentication()) {
-        return;
-    }
-    d->passwordLoaded = true;
-
-    // check whether there is a chance to find our password at all
-    if (Wallet::folderDoesNotExist(Wallet::NetworkWallet(), WALLET_FOLDER) ||
-            Wallet::keyDoesNotExist(Wallet::NetworkWallet(), WALLET_FOLDER,
-                                    QString::number(id()))) {
-        // try migrating password from kmail
-        if (Wallet::folderDoesNotExist(Wallet::NetworkWallet(), KMAIL_WALLET_FOLDER) ||
-                Wallet::keyDoesNotExist(Wallet::NetworkWallet(), KMAIL_WALLET_FOLDER,
-                                        QStringLiteral("transport-%1").arg(id()))) {
-            return;
-        }
-        qCDebug(MAILTRANSPORT_LOG) << "migrating password from kmail wallet";
-        KWallet::Wallet *wallet = TransportManager::self()->wallet();
-        if (wallet) {
-            QString pwd;
-            wallet->setFolder(KMAIL_WALLET_FOLDER);
-            if (wallet->readPassword(QStringLiteral("transport-%1").arg(id()), pwd) == 0) {
-                setPassword(pwd);
-                save();
-            } else {
-                d->password.clear();
-                d->passwordLoaded = false;
-            }
-            wallet->removeEntry(QStringLiteral("transport-%1").arg(id()));
-            wallet->setFolder(WALLET_FOLDER);
-        }
-        return;
-    }
-
-    // finally try to open the wallet and read the password
-    KWallet::Wallet *wallet = TransportManager::self()->wallet();
-    if (wallet) {
-        QString pwd;
-        if (wallet->readPassword(QString::number(id()), pwd) == 0) {
-            setPassword(pwd);
-        } else {
-            d->password.clear();
-            d->passwordLoaded = false;
-        }
-    }
-}
-
-bool Transport::needsWalletMigration() const
-{
-    return d->needsWalletMigration;
-}
-
-void Transport::migrateToWallet()
-{
-    qCDebug(MAILTRANSPORT_LOG) << "migrating" << id() << "to wallet";
-    d->needsWalletMigration = false;
-    KConfigGroup group(config(), currentGroup());
-    group.deleteEntry("password");
-    group.deleteEntry("password-kmail");
-    d->passwordDirty = true;
-    d->storePasswordInFile = false;
-    save();
-}
-
-Transport *Transport::clone() const
-{
-    QString id = currentGroup().mid(10);
-    return new Transport(id);
-}
-
-TransportType Transport::transportType() const
-{
-    if (!d->transportType.isValid()) {
-        qCWarning(MAILTRANSPORT_LOG) << "Invalid transport type.";
-    }
-    return d->transportType;
-}
-
-void Transport::setTransportType(const TransportType &type)
-{
-    Q_ASSERT(type.isValid());
-    d->transportType = type;
-    setType(type.type());
-}
-
diff -Nru kmailtransport-16.12.3/src/transport.h kmailtransport-17.04.3/src/transport.h
--- kmailtransport-16.12.3/src/transport.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transport.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,174 +0,0 @@
-/*
-    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_TRANSPORT_H
-#define MAILTRANSPORT_TRANSPORT_H
-
-#include <mailtransport_export.h>
-#include <transportbase.h>
-#include <transporttype.h>
-
-class TransportPrivate;
-
-namespace MailTransport
-{
-
-class TransportType;
-
-/**
-  Represents the settings of a specific mail transport.
-
-  To create a new empty Transport object, use TransportManager::createTransport().
-
-  Initialize an empty Transport object by calling the set...() methods defined in
-  kcfg-generated TransportBase, and in this class. Note that some transports use
-  the "host" setting to store the following values:
-   - Akonadi transports: resource ID.
-*/
-// TODO KDE5: Do something about the kcfg-generated TransportBase.
-// Currently it has the config stuff as private members, which means it is
-// utterly inextensible.  Also the akonadi-type transports use
-// the "host" setting for keeping the the resource id.
-// This is a hack; they should have separate config options... (cberzan)
-class MAILTRANSPORT_EXPORT Transport : public TransportBase
-{
-    Q_OBJECT
-    friend class TransportManager;
-    friend class TransportManagerPrivate;
-
-public:
-    /**
-      Destructor
-    */
-    virtual ~Transport();
-
-    typedef QList<Transport *> List;
-
-    /**
-      Returns true if this transport is valid, ie. has all necessary data set.
-    */
-    bool isValid() const;
-
-    /**
-      Returns the password of this transport.
-    */
-    QString password();
-
-    /**
-      Sets the password of this transport.
-      @param passwd The new password.
-    */
-    void setPassword(const QString &passwd);
-
-    /**
-      Makes sure the transport has a unique name.  Adds #1, #2, #3 etc. if
-      necessary.
-      @since 4.4
-    */
-    void forceUniqueName();
-
-    /**
-      This function synchronizes the password of this transport with the
-      password of the transport with the same ID that is managed by the
-      transport manager. This is only useful for cloned transports, since
-      their passwords don't automatically get updated when calling
-      TransportManager::loadPasswordsAsync() or TransportManager::loadPasswords().
-
-      @sa clone()
-      @since 4.2
-    */
-    void updatePasswordState();
-
-    /**
-      Returns true if all settings have been loaded.
-      This is the way to find out if the password has already been loaded
-      from the wallet.
-    */
-    bool isComplete() const;
-
-    /**
-      Returns a string representation of the authentication type.
-    */
-    QString authenticationTypeString() const;
-
-    /**
-      Returns a string representation of the authentication type.
-      Convienence function when there isn't a Transport object
-      instantiated.
-
-      @since 4.5
-    */
-    static QString authenticationTypeString(int type);
-
-    /**
-      Returns a deep copy of this Transport object which will no longer be
-      automatically updated. Use this if you need to store a Transport object
-      over a longer time. However it is recommended to store transport identifiers
-      instead if possible.
-
-      @sa updatePasswordState()
-    */
-    Transport *clone() const;
-
-    /**
-      Returns the type of this transport.
-      @see TransportType.
-      @since 4.4
-    */
-    TransportType transportType() const;
-
-    /**
-      Sets the type of this transport.
-      @see TransportType.
-      @since 4.4
-    */
-    void setTransportType(const TransportType &type);
-
-protected:
-    /**
-      Creates a Transport object. Should only be used by TransportManager.
-      @param cfgGroup The KConfig group to read its data from.
-    */
-    Transport(const QString &cfgGroup);
-
-    void usrRead() Q_DECL_OVERRIDE;
-    bool usrSave() Q_DECL_OVERRIDE;
-
-    /**
-      Returns true if the password was not stored in the wallet.
-    */
-    bool needsWalletMigration() const;
-
-    /**
-      Try to migrate the password from the config file to the wallet.
-    */
-    void migrateToWallet();
-
-private Q_SLOTS:
-
-    // Used by our friend, TransportManager
-    void readPassword();
-
-private:
-    TransportPrivate *const d;
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_TRANSPORT_H
diff -Nru kmailtransport-16.12.3/src/transportjob.cpp kmailtransport-17.04.3/src/transportjob.cpp
--- kmailtransport-16.12.3/src/transportjob.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportjob.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,130 +0,0 @@
-/*
-    Copyright (c) 2007 Volker Krause <vkrause@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "transportjob.h"
-#include "transport.h"
-
-#include <QBuffer>
-
-#include <KLocalizedString>
-
-using namespace MailTransport;
-
-class MailTransport::TransportJob::Private
-{
-public:
-    Transport *transport;
-    QString sender;
-    QStringList to;
-    QStringList cc;
-    QStringList bcc;
-    QByteArray data;
-    QBuffer *buffer;
-};
-
-TransportJob::TransportJob(Transport *transport, QObject *parent)
-    : KCompositeJob(parent), d(new Private)
-{
-    d->transport = transport;
-    d->buffer = Q_NULLPTR;
-}
-
-TransportJob::~ TransportJob()
-{
-    delete d->transport;
-    delete d;
-}
-
-void TransportJob::setSender(const QString &sender)
-{
-    d->sender = sender;
-}
-
-void TransportJob::setTo(const QStringList &to)
-{
-    d->to = to;
-}
-
-void TransportJob::setCc(const QStringList &cc)
-{
-    d->cc = cc;
-}
-
-void TransportJob::setBcc(const QStringList &bcc)
-{
-    d->bcc = bcc;
-}
-
-void TransportJob::setData(const QByteArray &data)
-{
-    d->data = data;
-}
-
-Transport *TransportJob::transport() const
-{
-    return d->transport;
-}
-
-QString TransportJob::sender() const
-{
-    return d->sender;
-}
-
-QStringList TransportJob::to() const
-{
-    return d->to;
-}
-
-QStringList TransportJob::cc() const
-{
-    return d->cc;
-}
-
-QStringList TransportJob::bcc() const
-{
-    return d->bcc;
-}
-
-QByteArray TransportJob::data() const
-{
-    return d->data;
-}
-
-QBuffer *TransportJob::buffer()
-{
-    if (!d->buffer) {
-        d->buffer = new QBuffer(this);
-        d->buffer->setData(d->data);
-        d->buffer->open(QIODevice::ReadOnly);
-        Q_ASSERT(d->buffer->isOpen());
-    }
-    return d->buffer;
-}
-
-void TransportJob::start()
-{
-    if (!transport()->isValid()) {
-        setError(UserDefinedError);
-        setErrorText(i18n("The outgoing account \"%1\" is not correctly configured.",
-                          transport()->name()));
-        emitResult();
-        return;
-    }
-    doStart();
-}
diff -Nru kmailtransport-16.12.3/src/transportjob.h kmailtransport-17.04.3/src/transportjob.h
--- kmailtransport-16.12.3/src/transportjob.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportjob.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,150 +0,0 @@
-/*
-  Copyright (c) 2007 Volker Krause <vkrause@kde.org>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_TRANSPORTJOB_H
-#define MAILTRANSPORT_TRANSPORTJOB_H
-
-#include <mailtransport_export.h>
-
-#include <QtCore/QStringList>
-
-#include <KCompositeJob>
-
-class QBuffer;
-
-namespace MailTransport
-{
-
-class Transport;
-
-/**
-  Abstract base class for all mail transport jobs.
-  This is a job that is supposed to send exactly one mail.
-
-  @deprecated Use MessageQueueJob for sending e-mail.
-*/
-class MAILTRANSPORT_DEPRECATED_EXPORT TransportJob : public KCompositeJob
-{
-    Q_OBJECT
-    friend class TransportManager;
-
-public:
-    /**
-      Deletes this transport job.
-    */
-    virtual ~TransportJob();
-
-    /**
-      Sets the sender of the mail.
-      @p sender must be the plain email address, not including display name.
-    */
-    void setSender(const QString &sender);
-
-    /**
-      Sets the "To" receiver(s) of the mail.
-      @p to must be the plain email address(es), not including display name.
-    */
-    void setTo(const QStringList &to);
-
-    /**
-      Sets the "Cc" receiver(s) of the mail.
-      @p cc must be the plain email address(es), not including display name.
-    */
-    void setCc(const QStringList &cc);
-
-    /**
-      Sets the "Bcc" receiver(s) of the mail.
-      @p bcc must be the plain email address(es), not including display name.
-    */
-    void setBcc(const QStringList &bcc);
-
-    /**
-      Sets the content of the mail.
-    */
-    void setData(const QByteArray &data);
-
-    /**
-      Starts this job. It is recommended to not call this method directly but use
-      TransportManager::schedule() to execute the job instead.
-
-      @see TransportManager::schedule()
-    */
-    void start() Q_DECL_OVERRIDE;
-
-    /**
-      Returns the Transport object containing the mail transport settings.
-    */
-    Transport *transport() const;
-
-protected:
-    /**
-      Creates a new mail transport job.
-      @param transport The transport configuration. This must be a deep copy of
-      a Transport object, the job takes the ownership of this object.
-      @param parent The parent object.
-      @see TransportManager::createTransportJob()
-    */
-    explicit TransportJob(Transport *transport, QObject *parent = Q_NULLPTR);
-
-    /**
-      Returns the sender of the mail.
-    */
-    QString sender() const;
-
-    /**
-      Returns the "To" receiver(s) of the mail.
-    */
-    QStringList to() const;
-
-    /**
-      Returns the "Cc" receiver(s) of the mail.
-    */
-    QStringList cc() const;
-
-    /**
-      Returns the "Bcc" receiver(s) of the mail.
-    */
-    QStringList bcc() const;
-
-    /**
-      Returns the data of the mail.
-    */
-    QByteArray data() const;
-
-    /**
-      Returns a QBuffer opened on the message data. This is useful for
-      processing the data in smaller chunks.
-    */
-    QBuffer *buffer();
-
-    /**
-      Do the actual work, implement in your subclass.
-    */
-    virtual void doStart() = 0;
-
-private:
-    //@cond PRIVATE
-    class Private;
-    Private *const d;
-    //@endcond
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_TRANSPORTJOB_H
diff -Nru kmailtransport-16.12.3/src/transportlistview.cpp kmailtransport-17.04.3/src/transportlistview.cpp
--- kmailtransport-16.12.3/src/transportlistview.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportlistview.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,124 +0,0 @@
-/*
-  Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-  Based on KMail code by:
-  Copyright (c) 2002 Marc Mutz <mutz@kde.org>
-  Copyright (c) 2007 Mathias Soeken <msoeken@tzi.de>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#include "transportlistview.h"
-#include "transport.h"
-#include "transportmanager.h"
-#include "transporttype.h"
-
-#include <QHeaderView>
-#include <QLineEdit>
-
-#include "mailtransport_debug.h"
-#include <KLocalizedString>
-
-using namespace MailTransport;
-
-TransportListView::TransportListView(QWidget *parent)
-    : QTreeWidget(parent)
-{
-    setHeaderLabels(QStringList()
-                    << i18nc("@title:column email transport name", "Name")
-                    << i18nc("@title:column email transport type", "Type"));
-    setRootIsDecorated(false);
-    header()->setSectionsMovable(false);
-    header()->setSectionResizeMode(QHeaderView::ResizeToContents);
-    setAllColumnsShowFocus(true);
-    setAlternatingRowColors(true);
-    setSortingEnabled(true);
-    sortByColumn(0, Qt::AscendingOrder);
-    setSelectionMode(SingleSelection);
-
-    fillTransportList();
-    connect(TransportManager::self(), &TransportManager::transportsChanged, this, &TransportListView::fillTransportList);
-}
-
-void TransportListView::editItem(QTreeWidgetItem *item, int column)
-{
-    // TODO: is there a nicer way to make only the 'name' column editable?
-    if (column == 0 && item) {
-        Qt::ItemFlags oldFlags = item->flags();
-        item->setFlags(oldFlags | Qt::ItemIsEditable);
-        QTreeWidget::editItem(item, 0);
-        item->setFlags(oldFlags);
-        const int id = item->data(0, Qt::UserRole).toInt();
-        Transport *t = TransportManager::self()->transportById(id);
-        if (!t) {
-            qCWarning(MAILTRANSPORT_LOG) << "Transport" << id << "not known by manager.";
-            return;
-        }
-        if (TransportManager::self()->defaultTransportId() == t->id()) {
-            item->setText(0, t->name());
-        }
-    }
-}
-
-void TransportListView::commitData(QWidget *editor)
-{
-    if (selectedItems().isEmpty()) {
-        // transport was deleted by someone else???
-        qCDebug(MAILTRANSPORT_LOG) << "No selected item.";
-        return;
-    }
-    QTreeWidgetItem *item = selectedItems().first();
-    QLineEdit *edit = dynamic_cast<QLineEdit *>(editor);  // krazy:exclude=qclasses
-    Q_ASSERT(edit);   // original code had if
-
-    const int id = item->data(0, Qt::UserRole).toInt();
-    Transport *t = TransportManager::self()->transportById(id);
-    if (!t) {
-        qCWarning(MAILTRANSPORT_LOG) << "Transport" << id << "not known by manager.";
-        return;
-    }
-    qCDebug(MAILTRANSPORT_LOG) << "Renaming transport" << id << "to" << edit->text();
-    t->setName(edit->text());
-    t->forceUniqueName();
-    t->save();
-}
-
-void TransportListView::fillTransportList()
-{
-    // try to preserve the selection
-    int selected = -1;
-    if (currentItem()) {
-        selected = currentItem()->data(0, Qt::UserRole).toInt();
-    }
-
-    clear();
-    foreach (Transport *t, TransportManager::self()->transports()) {
-        QTreeWidgetItem *item = new QTreeWidgetItem(this);
-        item->setData(0, Qt::UserRole, t->id());
-        QString name = t->name();
-        if (TransportManager::self()->defaultTransportId() == t->id()) {
-            name += i18nc("@label the default mail transport", " (Default)");
-            QFont font(item->font(0));
-            font.setBold(true);
-            item->setFont(0, font);
-        }
-        item->setText(0, name);
-        item->setText(1, t->transportType().name());
-        if (t->id() == selected) {
-            setCurrentItem(item);
-        }
-    }
-}
diff -Nru kmailtransport-16.12.3/src/transportlistview.h kmailtransport-17.04.3/src/transportlistview.h
--- kmailtransport-16.12.3/src/transportlistview.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportlistview.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,53 +0,0 @@
-/*
-  Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_TRANSPORTLISTVIEW_H
-#define MAILTRANSPORT_TRANSPORTLISTVIEW_H
-
-#include <QTreeWidget>
-
-namespace MailTransport
-{
-
-/**
-  @internal
-  A QTreeWidget for transports.
-*/
-class TransportListView : public QTreeWidget
-{
-    Q_OBJECT
-
-public:
-    explicit TransportListView(QWidget *parent = Q_NULLPTR);
-    //virtual ~TransportListView() {}
-
-    // overloaded from QTreeWidget
-    void editItem(QTreeWidgetItem *item, int column = 0);
-
-protected Q_SLOTS:
-    void commitData(QWidget *editor) Q_DECL_OVERRIDE;
-
-private Q_SLOTS:
-    void fillTransportList();
-
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_TRANSPORTLISTVIEW_H
diff -Nru kmailtransport-16.12.3/src/transportmanagementwidget.cpp kmailtransport-17.04.3/src/transportmanagementwidget.cpp
--- kmailtransport-16.12.3/src/transportmanagementwidget.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportmanagementwidget.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,175 +0,0 @@
-/*
-  Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-
-  Based on KMail code by:
-  Copyright (C) 2001-2003 Marc Mutz <mutz@kde.org>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#include "transportmanagementwidget.h"
-#include "ui_transportmanagementwidget.h"
-#include "transportmanager.h"
-#include "transport.h"
-
-#include <KMessageBox>
-#include <QMenu>
-
-using namespace MailTransport;
-
-class Q_DECL_HIDDEN TransportManagementWidget::Private
-{
-public:
-
-    Private(TransportManagementWidget *parent);
-
-    Ui::TransportManagementWidget ui;
-    TransportManagementWidget *q;
-
-    // Slots
-    void defaultClicked();
-    void removeClicked();
-    void renameClicked();
-    void editClicked();
-    void addClicked();
-    void updateButtonState();
-    void slotCustomContextMenuRequested(const QPoint &);
-};
-
-TransportManagementWidget::Private::Private(TransportManagementWidget *parent)
-    : q(parent)
-{
-}
-
-TransportManagementWidget::TransportManagementWidget(QWidget *parent)
-    : QWidget(parent), d(new Private(this))
-{
-    d->ui.setupUi(this);
-    d->updateButtonState();
-
-    d->ui.transportList->setContextMenuPolicy(Qt::CustomContextMenu);
-    connect(d->ui.transportList, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)),
-            SLOT(updateButtonState()));
-    connect(d->ui.transportList, SIGNAL(itemDoubleClicked(QTreeWidgetItem*,int)),
-            SLOT(editClicked()));
-    connect(d->ui.addButton, SIGNAL(clicked()), SLOT(addClicked()));
-    connect(d->ui.editButton, SIGNAL(clicked()), SLOT(editClicked()));
-    connect(d->ui.renameButton, SIGNAL(clicked()), SLOT(renameClicked()));
-    connect(d->ui.removeButton, SIGNAL(clicked()), SLOT(removeClicked()));
-    connect(d->ui.defaultButton, SIGNAL(clicked()), SLOT(defaultClicked()));
-    connect(d->ui.transportList, SIGNAL(customContextMenuRequested(QPoint)),
-            SLOT(slotCustomContextMenuRequested(QPoint)));
-}
-
-TransportManagementWidget::~TransportManagementWidget()
-{
-    delete d;
-}
-
-void TransportManagementWidget::Private::updateButtonState()
-{
-    // TODO figure out current item vs. selected item (in almost every function)
-    if (!ui.transportList->currentItem()) {
-        ui.editButton->setEnabled(false);
-        ui.renameButton->setEnabled(false);
-        ui.removeButton->setEnabled(false);
-        ui.defaultButton->setEnabled(false);
-    } else {
-        ui.editButton->setEnabled(true);
-        ui.renameButton->setEnabled(true);
-        ui.removeButton->setEnabled(true);
-        if (ui.transportList->currentItem()->data(0, Qt::UserRole) ==
-                TransportManager::self()->defaultTransportId()) {
-            ui.defaultButton->setEnabled(false);
-        } else {
-            ui.defaultButton->setEnabled(true);
-        }
-    }
-}
-
-void TransportManagementWidget::Private::addClicked()
-{
-    TransportManager::self()->showTransportCreationDialog(q);
-}
-
-void TransportManagementWidget::Private::editClicked()
-{
-    if (!ui.transportList->currentItem()) {
-        return;
-    }
-
-    const int currentId = ui.transportList->currentItem()->data(0, Qt::UserRole).toInt();
-    Transport *transport = TransportManager::self()->transportById(currentId);
-    TransportManager::self()->configureTransport(transport, q);
-}
-
-void TransportManagementWidget::Private::renameClicked()
-{
-    if (!ui.transportList->currentItem()) {
-        return;
-    }
-
-    ui.transportList->editItem(ui.transportList->currentItem(), 0);
-}
-
-void TransportManagementWidget::Private::removeClicked()
-{
-    if (!ui.transportList->currentItem()) {
-        return;
-    }
-    const int rc =
-        KMessageBox::questionYesNo(
-            q,
-            i18n("Do you want to remove outgoing account '%1'?",
-                 ui.transportList->currentItem()->text(0)),
-            i18n("Remove outgoing account?"));
-    if (rc == KMessageBox::No) {
-        return;
-    }
-
-    TransportManager::self()->removeTransport(
-        ui.transportList->currentItem()->data(0, Qt::UserRole).toInt());
-}
-
-void TransportManagementWidget::Private::defaultClicked()
-{
-    if (!ui.transportList->currentItem()) {
-        return;
-    }
-
-    TransportManager::self()->setDefaultTransport(
-        ui.transportList->currentItem()->data(0, Qt::UserRole).toInt());
-}
-
-void TransportManagementWidget::Private::slotCustomContextMenuRequested(const QPoint &pos)
-{
-    QMenu *menu = new QMenu(q);
-    menu->addAction(i18n("Add..."), q, SLOT(addClicked()));
-    QTreeWidgetItem *item = ui.transportList->itemAt(pos);
-    if (item) {
-        menu->addAction(i18n("Modify..."), q, SLOT(editClicked()));
-        menu->addAction(i18n("Rename"), q, SLOT(renameClicked()));
-        menu->addAction(i18n("Remove"), q, SLOT(removeClicked()));
-        if (item->data(0, Qt::UserRole) != TransportManager::self()->defaultTransportId()) {
-            menu->addSeparator();
-            menu->addAction(i18n("Set as Default"), q, SLOT(defaultClicked()));
-        }
-    }
-    menu->exec(ui.transportList->viewport()->mapToGlobal(pos));
-    delete menu;
-}
-
-#include "moc_transportmanagementwidget.cpp"
diff -Nru kmailtransport-16.12.3/src/transportmanagementwidget.h kmailtransport-17.04.3/src/transportmanagementwidget.h
--- kmailtransport-16.12.3/src/transportmanagementwidget.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportmanagementwidget.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,66 +0,0 @@
-/*
-  Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-
-  Based on KMail code by:
-  Copyright (C) 2001-2003 Marc Mutz <mutz@kde.org>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_TRANSPORTMANAGEMENTWIDGET_H
-#define MAILTRANSPORT_TRANSPORTMANAGEMENTWIDGET_H
-
-#include <mailtransport_export.h>
-
-#include <QWidget>
-
-namespace MailTransport
-{
-
-/**
-  A widget to manage mail transports.
-*/
-class MAILTRANSPORT_EXPORT TransportManagementWidget : public QWidget
-{
-    Q_OBJECT
-
-public:
-    /**
-      Creates a new TransportManagementWidget.
-      @param parent The parent widget.
-    */
-    TransportManagementWidget(QWidget *parent = Q_NULLPTR);
-
-    /**
-      Destroys the widget.
-    */
-    virtual ~TransportManagementWidget();
-
-private:
-    class Private;
-    Private *const d;
-    Q_PRIVATE_SLOT(d, void defaultClicked())
-    Q_PRIVATE_SLOT(d, void removeClicked())
-    Q_PRIVATE_SLOT(d, void renameClicked())
-    Q_PRIVATE_SLOT(d, void editClicked())
-    Q_PRIVATE_SLOT(d, void addClicked())
-    Q_PRIVATE_SLOT(d, void updateButtonState())
-    Q_PRIVATE_SLOT(d, void slotCustomContextMenuRequested(const QPoint &))
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_TRANSPORTMANAGEMENTWIDGET_H
diff -Nru kmailtransport-16.12.3/src/transportmanager.cpp kmailtransport-17.04.3/src/transportmanager.cpp
--- kmailtransport-16.12.3/src/transportmanager.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportmanager.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,778 +0,0 @@
-/*
-  Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-
-  This library is free software; you can redistribute it and/or modify it
-  under the terms of the GNU Library General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or (at your
-  option) any later version.
-
-  This library is distributed in the hope that it will be useful, but WITHOUT
-  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-  License for more details.
-
-  You should have received a copy of the GNU Library General Public License
-  along with this library; see the file COPYING.LIB.  If not, write to the
-  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-  02110-1301, USA.
-*/
-
-#include "transportmanager.h"
-#include "resourcesendjob_p.h"
-#include "mailtransport_defs.h"
-#include "smtpjob.h"
-#include "transport.h"
-#include "transport_p.h"
-#include "transportjob.h"
-#include "transporttype.h"
-#include "transporttype_p.h"
-#include "addtransportdialog.h"
-#include "transportconfigdialog.h"
-#include "transportconfigwidget.h"
-#include "smtpconfigwidget.h"
-
-#include <QApplication>
-#include <QtDBus/QDBusConnection>
-#include <QtDBus/QDBusConnectionInterface>
-#include <QtDBus/QDBusServiceWatcher>
-#include <QPointer>
-#include <QRegExp>
-#include <QStringList>
-
-#include <KConfig>
-#include <KConfigGroup>
-#include "mailtransport_debug.h"
-#include <KEMailSettings>
-#include <KLocalizedString>
-#include <KMessageBox>
-#include <KRandom>
-#include <Kdelibs4ConfigMigrator>
-
-#include <KWallet/kwallet.h>
-
-#include <agentinstance.h>
-#include <agentmanager.h>
-
-using namespace MailTransport;
-using namespace KWallet;
-
-namespace MailTransport
-{
-/**
- * Private class that helps to provide binary compatibility between releases.
- * @internal
- */
-class TransportManagerPrivate
-{
-public:
-    TransportManagerPrivate(TransportManager *parent)
-        : q(parent)
-    {
-    }
-
-    ~TransportManagerPrivate()
-    {
-        delete config;
-        qDeleteAll(transports);
-    }
-
-    KConfig *config;
-    QList<Transport *> transports;
-    TransportType::List types;
-    bool myOwnChange;
-    bool appliedChange;
-    KWallet::Wallet *wallet;
-    bool walletOpenFailed;
-    bool walletAsyncOpen;
-    int defaultTransportId;
-    bool isMainInstance;
-    QList<TransportJob *> walletQueue;
-    TransportManager *q;
-
-    void readConfig();
-    void writeConfig();
-    void fillTypes();
-    int createId() const;
-    void prepareWallet();
-    void validateDefault();
-    void migrateToWallet();
-
-    // Slots
-    void slotTransportsChanged();
-    void slotWalletOpened(bool success);
-    void dbusServiceUnregistered();
-    void agentTypeAdded(const Akonadi::AgentType &atype);
-    void agentTypeRemoved(const Akonadi::AgentType &atype);
-    void jobResult(KJob *job);
-};
-
-}
-
-class StaticTransportManager : public TransportManager
-{
-public:
-    StaticTransportManager() : TransportManager() {}
-};
-
-StaticTransportManager *sSelf = Q_NULLPTR;
-
-static void destroyStaticTransportManager()
-{
-    delete sSelf;
-}
-
-TransportManager::TransportManager()
-    : QObject(), d(new TransportManagerPrivate(this))
-{
-    Kdelibs4ConfigMigrator migrate(QStringLiteral("transportmanager"));
-    migrate.setConfigFiles(QStringList() << QStringLiteral("mailtransports"));
-    migrate.migrate();
-
-    qAddPostRoutine(destroyStaticTransportManager);
-    d->myOwnChange = false;
-    d->appliedChange = false;
-    d->wallet = Q_NULLPTR;
-    d->walletOpenFailed = false;
-    d->walletAsyncOpen = false;
-    d->defaultTransportId = -1;
-    d->config = new KConfig(QStringLiteral("mailtransports"));
-
-    QDBusConnection::sessionBus().registerObject(DBUS_OBJECT_PATH, this,
-            QDBusConnection::ExportScriptableSlots |
-            QDBusConnection::ExportScriptableSignals);
-
-    QDBusServiceWatcher *watcher =
-        new QDBusServiceWatcher(DBUS_SERVICE_NAME, QDBusConnection::sessionBus(),
-                                QDBusServiceWatcher::WatchForUnregistration, this);
-    connect(watcher, SIGNAL(serviceUnregistered(QString)),
-            SLOT(dbusServiceUnregistered()));
-
-    QDBusConnection::sessionBus().connect(QString(), QString(),
-                                          DBUS_INTERFACE_NAME, DBUS_CHANGE_SIGNAL,
-                                          this, SLOT(slotTransportsChanged()));
-
-    d->isMainInstance = QDBusConnection::sessionBus().registerService(DBUS_SERVICE_NAME);
-
-    d->fillTypes();
-}
-
-TransportManager::~TransportManager()
-{
-    qRemovePostRoutine(destroyStaticTransportManager);
-    delete d;
-}
-
-TransportManager *TransportManager::self()
-{
-    if (!sSelf) {
-        sSelf = new StaticTransportManager;
-        sSelf->d->readConfig();
-    }
-    return sSelf;
-}
-
-Transport *TransportManager::transportById(int id, bool def) const
-{
-    foreach (Transport *t, d->transports) {
-        if (t->id() == id) {
-            return t;
-        }
-    }
-
-    if (def || (id == 0 && d->defaultTransportId != id)) {
-        return transportById(d->defaultTransportId, false);
-    }
-    return Q_NULLPTR;
-}
-
-Transport *TransportManager::transportByName(const QString &name, bool def) const
-{
-    foreach (Transport *t, d->transports) {
-        if (t->name() == name) {
-            return t;
-        }
-    }
-    if (def) {
-        return transportById(0, false);
-    }
-    return Q_NULLPTR;
-}
-
-QList< Transport * > TransportManager::transports() const
-{
-    return d->transports;
-}
-
-TransportType::List TransportManager::types() const
-{
-    return d->types;
-}
-
-Transport *TransportManager::createTransport() const
-{
-    int id = d->createId();
-    Transport *t = new Transport(QString::number(id));
-    t->setId(id);
-    return t;
-}
-
-void TransportManager::addTransport(Transport *transport)
-{
-    if (d->transports.contains(transport)) {
-        qCDebug(MAILTRANSPORT_LOG) << "Already have this transport.";
-        return;
-    }
-
-    qCDebug(MAILTRANSPORT_LOG) << "Added transport" << transport;
-    d->transports.append(transport);
-    d->validateDefault();
-    emitChangesCommitted();
-}
-
-void TransportManager::schedule(TransportJob *job)
-{
-    connect(job, SIGNAL(result(KJob*)), SLOT(jobResult(KJob*)));
-
-    // check if the job is waiting for the wallet
-    if (!job->transport()->isComplete()) {
-        qCDebug(MAILTRANSPORT_LOG) << "job waits for wallet:" << job;
-        d->walletQueue << job;
-        loadPasswordsAsync();
-        return;
-    }
-
-    job->start();
-}
-
-void TransportManager::createDefaultTransport()
-{
-    KEMailSettings kes;
-    Transport *t = createTransport();
-    t->setName(i18n("Default Transport"));
-    t->setHost(kes.getSetting(KEMailSettings::OutServer));
-    if (t->isValid()) {
-        t->save();
-        addTransport(t);
-    } else {
-        qCWarning(MAILTRANSPORT_LOG) << "KEMailSettings does not contain a valid transport.";
-    }
-}
-
-bool TransportManager::showTransportCreationDialog(QWidget *parent,
-        ShowCondition showCondition)
-{
-    if (showCondition == IfNoTransportExists) {
-        if (!isEmpty()) {
-            return true;
-        }
-
-        const int response = KMessageBox::messageBox(parent,
-                             KMessageBox::WarningContinueCancel,
-                             i18n("You must create an outgoing account before sending."),
-                             i18n("Create Account Now?"),
-                             KGuiItem(i18n("Create Account Now")));
-        if (response != KMessageBox::Continue) {
-            return false;
-        }
-    }
-
-    QPointer<AddTransportDialog> dialog = new AddTransportDialog(parent);
-    const bool accepted = (dialog->exec() == QDialog::Accepted);
-    delete dialog;
-    return accepted;
-}
-
-bool TransportManager::configureTransport(Transport *transport, QWidget *parent)
-{
-    if (transport->type() == Transport::EnumType::Akonadi) {
-        using namespace Akonadi;
-        AgentInstance instance = AgentManager::self()->instance(transport->host());
-        if (!instance.isValid()) {
-            qCWarning(MAILTRANSPORT_LOG) << "Invalid resource instance" << transport->host();
-        }
-        instance.configure(parent);   // Async...
-        transport->save();
-        return true; // No way to know here if the user cancelled or not.
-    }
-
-    QPointer<TransportConfigDialog> transportConfigDialog =
-        new TransportConfigDialog(transport, parent);
-    transportConfigDialog->setWindowTitle(i18n("Configure account"));
-    bool okClicked = (transportConfigDialog->exec() == QDialog::Accepted);
-    delete transportConfigDialog;
-    return okClicked;
-}
-
-TransportJob *TransportManager::createTransportJob(int transportId)
-{
-    Transport *t = transportById(transportId, false);
-    if (!t) {
-        return Q_NULLPTR;
-    }
-    t = t->clone(); // Jobs delete their transports.
-    t->updatePasswordState();
-    switch (t->type()) {
-    case Transport::EnumType::SMTP:
-        return new SmtpJob(t, this);
-    case Transport::EnumType::Akonadi:
-        return new ResourceSendJob(t, this);
-    }
-    Q_ASSERT(false);
-    return Q_NULLPTR;
-}
-
-TransportJob *TransportManager::createTransportJob(const QString &transport)
-{
-    bool ok = false;
-    Transport *t = Q_NULLPTR;
-
-    int transportId = transport.toInt(&ok);
-    if (ok) {
-        t = transportById(transportId);
-    }
-
-    if (!t) {
-        t = transportByName(transport, false);
-    }
-
-    if (t) {
-        return createTransportJob(t->id());
-    }
-
-    return Q_NULLPTR;
-}
-
-bool TransportManager::isEmpty() const
-{
-    return d->transports.isEmpty();
-}
-
-QList<int> TransportManager::transportIds() const
-{
-    QList<int> rv;
-    rv.reserve(d->transports.count());
-    foreach (Transport *t, d->transports) {
-        rv << t->id();
-    }
-    return rv;
-}
-
-QStringList TransportManager::transportNames() const
-{
-    QStringList rv;
-    rv.reserve(d->transports.count());
-    foreach (Transport *t, d->transports) {
-        rv << t->name();
-    }
-    return rv;
-}
-
-QString TransportManager::defaultTransportName() const
-{
-    Transport *t = transportById(d->defaultTransportId, false);
-    if (t) {
-        return t->name();
-    }
-    return QString();
-}
-
-int TransportManager::defaultTransportId() const
-{
-    return d->defaultTransportId;
-}
-
-void TransportManager::setDefaultTransport(int id)
-{
-    if (id == d->defaultTransportId || !transportById(id, false)) {
-        return;
-    }
-    d->defaultTransportId = id;
-    d->writeConfig();
-}
-
-void TransportManager::removeTransport(int id)
-{
-    Transport *t = transportById(id, false);
-    if (!t) {
-        return;
-    }
-    emit transportRemoved(t->id(), t->name());
-
-    // Kill the resource, if Akonadi-type transport.
-    if (t->type() == Transport::EnumType::Akonadi) {
-        using namespace Akonadi;
-        const AgentInstance instance = AgentManager::self()->instance(t->host());
-        if (!instance.isValid()) {
-            qCWarning(MAILTRANSPORT_LOG) << "Could not find resource instance.";
-        }
-        AgentManager::self()->removeInstance(instance);
-    }
-
-    d->transports.removeAll(t);
-    d->validateDefault();
-    QString group = t->currentGroup();
-    if (t->storePassword()) {
-        Wallet *currentWallet = wallet();
-        if (currentWallet) {
-            currentWallet->removeEntry(QString::number(t->id()));
-        }
-    }
-    delete t;
-    d->config->deleteGroup(group);
-    d->writeConfig();
-
-}
-
-void TransportManagerPrivate::readConfig()
-{
-    QList<Transport *> oldTransports = transports;
-    transports.clear();
-
-    QRegExp re(QStringLiteral("^Transport (.+)$"));
-    QStringList groups = config->groupList().filter(re);
-    foreach (const QString &s, groups) {
-        if (re.indexIn(s) == -1) {
-            continue;
-        }
-        Transport *t = Q_NULLPTR;
-
-        // see if we happen to have that one already
-        foreach (Transport *old, oldTransports) {
-            if (old->currentGroup() == QLatin1String("Transport ") + re.cap(1)) {
-                qCDebug(MAILTRANSPORT_LOG) << "reloading existing transport:" << s;
-                t = old;
-                t->d->passwordNeedsUpdateFromWallet = true;
-                t->load();
-                oldTransports.removeAll(old);
-                break;
-            }
-        }
-
-        if (!t) {
-            t = new Transport(re.cap(1));
-        }
-        if (t->id() <= 0) {
-            t->setId(createId());
-            t->save();
-        }
-        transports.append(t);
-    }
-
-    qDeleteAll(oldTransports);
-    oldTransports.clear();
-
-    // read default transport
-    KConfigGroup group(config, "General");
-    defaultTransportId = group.readEntry("default-transport", 0);
-    if (defaultTransportId == 0) {
-        // migrated default transport contains the name instead
-        QString name = group.readEntry("default-transport", QString());
-        if (!name.isEmpty()) {
-            Transport *t = q->transportByName(name, false);
-            if (t) {
-                defaultTransportId = t->id();
-                writeConfig();
-            }
-        }
-    }
-    validateDefault();
-    migrateToWallet();
-    q->loadPasswordsAsync();
-}
-
-void TransportManagerPrivate::writeConfig()
-{
-    KConfigGroup group(config, "General");
-    group.writeEntry("default-transport", defaultTransportId);
-    config->sync();
-    q->emitChangesCommitted();
-}
-
-void TransportManagerPrivate::fillTypes()
-{
-    Q_ASSERT(types.isEmpty());
-
-    // SMTP.
-    {
-        TransportType type;
-        type.d->mType = Transport::EnumType::SMTP;
-        type.d->mName = i18nc("@option SMTP transport", "SMTP");
-        type.d->mDescription = i18n("An SMTP server on the Internet");
-        types << type;
-    }
-
-    // All Akonadi resources with MailTransport capability.
-    {
-        using namespace Akonadi;
-        foreach (const AgentType &atype, AgentManager::self()->types()) {
-            // TODO probably the string "MailTransport" should be #defined somewhere
-            // and used like that in the resources (?)
-            if (atype.capabilities().contains(QStringLiteral("MailTransport"))) {
-                TransportType type;
-                type.d->mType = Transport::EnumType::Akonadi;
-                type.d->mAgentType = atype;
-                type.d->mName = atype.name();
-                type.d->mDescription = atype.description();
-                types << type;
-                qCDebug(MAILTRANSPORT_LOG) << "Found Akonadi type" << atype.name();
-            }
-        }
-
-        // Watch for appearing and disappearing types.
-        QObject::connect(AgentManager::self(), SIGNAL(typeAdded(Akonadi::AgentType)),
-                         q, SLOT(agentTypeAdded(Akonadi::AgentType)));
-        QObject::connect(AgentManager::self(), SIGNAL(typeRemoved(Akonadi::AgentType)),
-                         q, SLOT(agentTypeRemoved(Akonadi::AgentType)));
-    }
-
-    qCDebug(MAILTRANSPORT_LOG) << "Have SMTP and" << types.count() - 1 << "Akonadi types.";
-}
-
-void TransportManager::emitChangesCommitted()
-{
-    d->myOwnChange = true; // prevent us from reading our changes again
-    d->appliedChange = false; // but we have to read them at least once
-    emit transportsChanged();
-    emit changesCommitted();
-}
-
-void TransportManagerPrivate::slotTransportsChanged()
-{
-    if (myOwnChange && appliedChange) {
-        myOwnChange = false;
-        appliedChange = false;
-        return;
-    }
-
-    qCDebug(MAILTRANSPORT_LOG);
-    config->reparseConfiguration();
-    // FIXME: this deletes existing transport objects!
-    readConfig();
-    appliedChange = true; // to prevent recursion
-    emit q->transportsChanged();
-}
-
-int TransportManagerPrivate::createId() const
-{
-    QList<int> usedIds;
-    usedIds.reserve(1 + transports.count());
-    foreach (Transport *t, transports) {
-        usedIds << t->id();
-    }
-    usedIds << 0; // 0 is default for unknown
-    int newId;
-    do {
-        newId = KRandom::random();
-    } while (usedIds.contains(newId));
-    return newId;
-}
-
-KWallet::Wallet *TransportManager::wallet()
-{
-    if (d->wallet && d->wallet->isOpen()) {
-        return d->wallet;
-    }
-
-    if (!Wallet::isEnabled() || d->walletOpenFailed) {
-        return Q_NULLPTR;
-    }
-
-    WId window = 0;
-    if (qApp->activeWindow()) {
-        window = qApp->activeWindow()->winId();
-    } else if (!QApplication::topLevelWidgets().isEmpty()) {
-        window = qApp->topLevelWidgets().first()->winId();
-    }
-
-    delete d->wallet;
-    d->wallet = Wallet::openWallet(Wallet::NetworkWallet(), window);
-
-    if (!d->wallet) {
-        d->walletOpenFailed = true;
-        return Q_NULLPTR;
-    }
-
-    d->prepareWallet();
-    return d->wallet;
-}
-
-void TransportManagerPrivate::prepareWallet()
-{
-    if (!wallet) {
-        return;
-    }
-    if (!wallet->hasFolder(WALLET_FOLDER)) {
-        wallet->createFolder(WALLET_FOLDER);
-    }
-    wallet->setFolder(WALLET_FOLDER);
-}
-
-void TransportManager::loadPasswords()
-{
-    foreach (Transport *t, d->transports) {
-        t->readPassword();
-    }
-
-    // flush the wallet queue
-    const QList<TransportJob *> copy = d->walletQueue;
-    d->walletQueue.clear();
-    foreach (TransportJob *job, copy) {
-        job->start();
-    }
-
-    emit passwordsChanged();
-}
-
-void TransportManager::loadPasswordsAsync()
-{
-    qCDebug(MAILTRANSPORT_LOG);
-
-    // check if there is anything to do at all
-    bool found = false;
-    foreach (Transport *t, d->transports) {
-        if (!t->isComplete()) {
-            found = true;
-            break;
-        }
-    }
-    if (!found) {
-        return;
-    }
-
-    // async wallet opening
-    if (!d->wallet && !d->walletOpenFailed) {
-        WId window = 0;
-        if (qApp->activeWindow()) {
-            window = qApp->activeWindow()->winId();
-        } else if (!QApplication::topLevelWidgets().isEmpty()) {
-            window = qApp->topLevelWidgets().first()->winId();
-        }
-
-        d->wallet = Wallet::openWallet(Wallet::NetworkWallet(), window,
-                                       Wallet::Asynchronous);
-        if (d->wallet) {
-            connect(d->wallet, SIGNAL(walletOpened(bool)), SLOT(slotWalletOpened(bool)));
-            d->walletAsyncOpen = true;
-        } else {
-            d->walletOpenFailed = true;
-            loadPasswords();
-        }
-        return;
-    }
-    if (d->wallet && !d->walletAsyncOpen) {
-        loadPasswords();
-    }
-}
-
-void TransportManagerPrivate::slotWalletOpened(bool success)
-{
-    qCDebug(MAILTRANSPORT_LOG);
-    walletAsyncOpen = false;
-    if (!success) {
-        walletOpenFailed = true;
-        delete wallet;
-        wallet = Q_NULLPTR;
-    } else {
-        prepareWallet();
-    }
-    q->loadPasswords();
-}
-
-void TransportManagerPrivate::validateDefault()
-{
-    if (!q->transportById(defaultTransportId, false)) {
-        if (q->isEmpty()) {
-            defaultTransportId = -1;
-        } else {
-            defaultTransportId = transports.first()->id();
-            writeConfig();
-        }
-    }
-}
-
-void TransportManagerPrivate::migrateToWallet()
-{
-    // check if we tried this already
-    static bool firstRun = true;
-    if (!firstRun) {
-        return;
-    }
-    firstRun = false;
-
-    // check if we are the main instance
-    if (!isMainInstance) {
-        return;
-    }
-
-    // check if migration is needed
-    QStringList names;
-    foreach (Transport *t, transports) {
-        if (t->needsWalletMigration()) {
-            names << t->name();
-        }
-    }
-    if (names.isEmpty()) {
-        return;
-    }
-
-    // ask user if he wants to migrate
-    int result = KMessageBox::questionYesNoList(
-                     Q_NULLPTR,
-                     i18n("The following mail transports store their passwords in an "
-                          "unencrypted configuration file.\nFor security reasons, "
-                          "please consider migrating these passwords to KWallet, the "
-                          "KDE Wallet management tool,\nwhich stores sensitive data "
-                          "for you in a strongly encrypted file.\n"
-                          "Do you want to migrate your passwords to KWallet?"),
-                     names, i18n("Question"),
-                     KGuiItem(i18n("Migrate")), KGuiItem(i18n("Keep")),
-                     QStringLiteral("WalletMigrate"));
-    if (result != KMessageBox::Yes) {
-        return;
-    }
-
-    // perform migration
-    foreach (Transport *t, transports) {
-        if (t->needsWalletMigration()) {
-            t->migrateToWallet();
-        }
-    }
-}
-
-void TransportManagerPrivate::dbusServiceUnregistered()
-{
-    QDBusConnection::sessionBus().registerService(DBUS_SERVICE_NAME);
-}
-
-void TransportManagerPrivate::agentTypeAdded(const Akonadi::AgentType &atype)
-{
-    using namespace Akonadi;
-    if (atype.capabilities().contains(QStringLiteral("MailTransport"))) {
-        TransportType type;
-        type.d->mType = Transport::EnumType::Akonadi;
-        type.d->mAgentType = atype;
-        type.d->mName = atype.name();
-        type.d->mDescription = atype.description();
-        types << type;
-        qCDebug(MAILTRANSPORT_LOG) << "Added new Akonadi type" << atype.name();
-    }
-}
-
-void TransportManagerPrivate::agentTypeRemoved(const Akonadi::AgentType &atype)
-{
-    using namespace Akonadi;
-    foreach (const TransportType &type, types) {
-        if (type.type() == Transport::EnumType::Akonadi &&
-                type.agentType() == atype) {
-            types.removeAll(type);
-            qCDebug(MAILTRANSPORT_LOG) << "Removed Akonadi type" << atype.name();
-        }
-    }
-}
-
-void TransportManagerPrivate::jobResult(KJob *job)
-{
-    walletQueue.removeAll(static_cast<TransportJob *>(job));
-}
-
-#include "moc_transportmanager.cpp"
diff -Nru kmailtransport-16.12.3/src/transportmanager.h kmailtransport-17.04.3/src/transportmanager.h
--- kmailtransport-16.12.3/src/transportmanager.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transportmanager.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,305 +0,0 @@
-/*
-    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_TRANSPORTMANAGER_H
-#define MAILTRANSPORT_TRANSPORTMANAGER_H
-
-#include <mailtransport_export.h>
-#include <transporttype.h>
-
-#include <QtCore/QList>
-#include <QtCore/QObject>
-
-#include <agenttype.h>
-
-class KJob;
-
-namespace KWallet
-{
-class Wallet;
-}
-
-namespace MailTransport
-{
-
-class Transport;
-class TransportJob;
-class TransportManagerPrivate;
-
-/**
-  @short Central transport management interface.
-
-  This class manages the creation, configuration, and removal of mail
-  transports, as well as the loading and storing of mail transport settings.
-
-  It also handles the creation of transport jobs, although that behaviour is
-  deprecated and you are encouraged to use MessageQueueJob.
-
-  @see MessageQueueJob.
-*/
-class MAILTRANSPORT_EXPORT TransportManager : public QObject
-{
-    Q_OBJECT
-    Q_CLASSINFO("D-Bus Interface", "org.kde.pim.TransportManager")
-
-    friend class Transport;
-    friend class TransportManagerPrivate;
-
-public:
-
-    /**
-      Destructor.
-    */
-    virtual ~TransportManager();
-
-    /**
-      Returns the TransportManager instance.
-    */
-    static TransportManager *self();
-
-    /**
-      Tries to load passwords asynchronously from KWallet if needed.
-      The passwordsChanged() signal is emitted once the passwords have been loaded.
-      Nothing happens if the passwords were already available.
-    */
-    void loadPasswordsAsync();
-
-    /**
-      Returns the Transport object with the given id.
-      @param id The identifier of the Transport.
-      @param def if set to true, the default transport will be returned if the
-      specified Transport object could not be found, 0 otherwise.
-      @returns A Transport object for immediate use. It might become invalid as
-      soon as the event loop is entered again due to remote changes. If you need
-      to store a Transport object, store the transport identifier instead.
-    */
-    Transport *transportById(int id, bool def = true) const;
-
-    /**
-      Returns the transport object with the given name.
-      @param name The transport name.
-      @param def if set to true, the default transport will be returned if the
-      specified Transport object could not be found, 0 otherwise.
-      @returns A Transport object for immediate use, see transportById() for
-      limitations.
-    */
-    Transport *transportByName(const QString &name, bool def = true) const;
-
-    /**
-      Returns a list of all available transports.
-      Note: The Transport objects become invalid as soon as a change occur, so
-      they are only suitable for immediate use.
-    */
-    QList<Transport *>transports() const;
-
-    /**
-      Returns a list of all available transport types.
-    */
-    TransportType::List types() const;
-
-    /**
-      Creates a new, empty Transport object. The object is owned by the caller.
-      If you want to add the Transport permanently (eg. after configuring it)
-      call addTransport().
-    */
-    Transport *createTransport() const;
-
-    /**
-      Adds the given transport. The object ownership is transferred to
-      TransportMananger, ie. you must not delete @p transport.
-      @param transport The Transport object to add.
-    */
-    void addTransport(Transport *transport);
-
-    /**
-      Creates a mail transport job for the given transport identifier.
-      Returns 0 if the specified transport is invalid.
-      @param transportId The transport identifier.
-
-      @deprecated use MessageQueueJob to queue messages
-                  and rely on the Dispatcher Agent to send them.
-    */
-    MAILTRANSPORT_DEPRECATED TransportJob *createTransportJob(int transportId);
-
-    /**
-      Creates a mail transport job for the given transport identifer,
-      or transport name.
-      Returns 0 if the specified transport is invalid.
-      @param transport A string defining a mail transport.
-
-      @deprecated use MessageQueueJob to queue messages
-                  and rely on the Dispatcher Agent to send them.
-    */
-    MAILTRANSPORT_DEPRECATED TransportJob *createTransportJob(const QString &transport);
-
-    /**
-      Executes the given transport job. This is the preferred way to start
-      transport jobs. It takes care of asynchronously loading passwords from
-      KWallet if necessary.
-      @param job The completely configured transport job to execute.
-
-      @deprecated use MessageQueueJob to queue messages
-                  and rely on the Dispatcher Agent to send them.
-    */
-    MAILTRANSPORT_DEPRECATED void schedule(TransportJob *job);
-
-    /**
-      Tries to create a transport based on KEMailSettings.
-      If the data in KEMailSettings is incomplete, no transport is created.
-    */
-    void createDefaultTransport();
-
-    /// Describes when to show the transport creation dialog
-    enum ShowCondition {
-        Always,              ///< Show the transport creation dialog unconditionally
-        IfNoTransportExists  ///< Only show the transport creation dialog if no transport currently
-        ///  exists. Ask the user if he wants to add a transport in
-        ///  the other case.
-    };
-
-    /**
-      Shows a dialog for creating and configuring a new transport.
-      @param parent Parent widget of the dialog.
-      @param showCondition the condition under which the dialog is shown at all
-      @return True if a new transport has been created and configured.
-      @since 4.4
-    */
-    bool showTransportCreationDialog(QWidget *parent, ShowCondition showCondition = Always);
-
-    /**
-      Open a configuration dialog for an existing transport.
-      @param transport The transport to configure.  It can be a new transport,
-                       or one already managed by TransportManager.
-      @param parent The parent widget for the dialog.
-      @return True if the user clicked Ok, false if the user cancelled.
-      @since 4.4
-    */
-    bool configureTransport(Transport *transport, QWidget *parent);
-
-public Q_SLOTS:
-    /**
-      Returns true if there are no mail transports at all.
-    */
-    Q_SCRIPTABLE bool isEmpty() const;
-
-    /**
-      Returns a list of transport identifiers.
-    */
-    Q_SCRIPTABLE QList<int> transportIds() const;
-
-    /**
-      Returns a list of transport names.
-    */
-    Q_SCRIPTABLE QStringList transportNames() const;
-
-    /**
-      Returns the default transport name.
-    */
-    Q_SCRIPTABLE QString defaultTransportName() const;
-
-    /**
-      Returns the default transport identifier.
-      Invalid if there are no transports at all.
-    */
-    Q_SCRIPTABLE int defaultTransportId() const;
-
-    /**
-      Sets the default transport. The change will be in effect immediately.
-      @param id The identifier of the new default transport.
-    */
-    Q_SCRIPTABLE void setDefaultTransport(int id);
-
-    /**
-      Deletes the specified transport.
-      @param id The identifier of the mail transport to remove.
-    */
-    Q_SCRIPTABLE void removeTransport(int id);
-
-Q_SIGNALS:
-    /**
-      Emitted when transport settings have changed (by this or any other
-      TransportManager instance).
-    */
-    Q_SCRIPTABLE void transportsChanged();
-
-    /**
-      Internal signal to synchronize all TransportManager instances.
-      This signal is emitted by the instance writing the changes.
-      You probably want to use transportsChanged() instead.
-    */
-    Q_SCRIPTABLE void changesCommitted();
-
-    /**
-      Emitted when passwords have been loaded from the wallet.
-      If you made a deep copy of a transport, you should call updatePasswordState()
-      for the cloned transport to ensure its password is updated as well.
-    */
-    void passwordsChanged();
-
-    /**
-      Emitted when a transport is deleted.
-      @param id The identifier of the deleted transport.
-      @param name The name of the deleted transport.
-    */
-    void transportRemoved(int id, const QString &name);
-
-    /**
-      Emitted when a transport has been renamed.
-      @param id The identifier of the renamed transport.
-      @param oldName The old name.
-      @param newName The new name.
-    */
-    void transportRenamed(int id, const QString &oldName, const QString &newName);
-
-protected:
-    /**
-      Returns a pointer to an open wallet if available, 0 otherwise.
-      The wallet is opened synchronously if necessary.
-    */
-    KWallet::Wallet *wallet();
-
-    /**
-      Loads all passwords synchronously.
-    */
-    void loadPasswords();
-
-    /**
-      Singleton class, the only instance resides in the static object sSelf.
-    */
-    TransportManager();
-
-private:
-
-    // These are used by our friend, Transport
-    void emitChangesCommitted();
-
-private:
-    TransportManagerPrivate *const d;
-
-    Q_PRIVATE_SLOT(d, void slotTransportsChanged())
-    Q_PRIVATE_SLOT(d, void slotWalletOpened(bool success))
-    Q_PRIVATE_SLOT(d, void dbusServiceUnregistered())
-    Q_PRIVATE_SLOT(d, void agentTypeAdded(const Akonadi::AgentType &atype))
-    Q_PRIVATE_SLOT(d, void agentTypeRemoved(const Akonadi::AgentType &atype))
-    Q_PRIVATE_SLOT(d, void jobResult(KJob *job))
-};
-
-} // namespace MailTransport
-
-#endif // MAILTRANSPORT_TRANSPORTMANAGER_H
diff -Nru kmailtransport-16.12.3/src/transport_p.h kmailtransport-17.04.3/src/transport_p.h
--- kmailtransport-16.12.3/src/transport_p.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transport_p.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-/*
-    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_TRANSPORT_P_H
-#define MAILTRANSPORT_TRANSPORT_P_H
-
-#include "transporttype.h"
-
-/**
- * Private class that helps to provide binary compatibility between releases.
- * @internal
- */
-class TransportPrivate
-{
-public:
-    MailTransport::TransportType transportType;
-    QString password;
-    QString oldName;
-    bool passwordLoaded;
-    bool passwordDirty;
-    bool storePasswordInFile;
-    bool needsWalletMigration;
-    bool passwordNeedsUpdateFromWallet;
-};
-
-#endif
diff -Nru kmailtransport-16.12.3/src/transporttype.cpp kmailtransport-17.04.3/src/transporttype.cpp
--- kmailtransport-16.12.3/src/transporttype.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transporttype.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,90 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "transporttype.h"
-#include "transporttype_p.h"
-#include "transport.h"
-
-#include <agentmanager.h>
-
-using namespace MailTransport;
-
-TransportType::TransportType()
-    : d(new Private)
-{
-}
-
-TransportType::TransportType(const TransportType &other)
-    : d(other.d)
-{
-}
-
-TransportType::~TransportType()
-{
-}
-
-TransportType &TransportType::operator=(const TransportType &other)
-{
-    if (this != &other) {
-        d = other.d;
-    }
-    return *this;
-}
-
-bool TransportType::operator==(const TransportType &other) const
-{
-    if (d->mType == Transport::EnumType::Akonadi &&
-            other.d->mType == Transport::EnumType::Akonadi) {
-        return (d->mAgentType == other.d->mAgentType);
-    }
-    return (d->mType == other.d->mType);
-}
-
-bool TransportType::isValid() const
-{
-    using namespace Akonadi;
-
-    if (d->mType == Transport::EnumType::Akonadi) {
-        return d->mAgentType.isValid() &&
-               AgentManager::self()->types().contains(d->mAgentType);
-    } else {
-        return d->mType >= 0;
-    }
-}
-
-TransportBase::EnumType::type TransportType::type() const
-{
-    return static_cast<TransportBase::EnumType::type>(d->mType);
-}
-
-QString TransportType::name() const
-{
-    return d->mName;
-}
-
-QString TransportType::description() const
-{
-    return d->mDescription;
-}
-
-Akonadi::AgentType TransportType::agentType() const
-{
-    Q_ASSERT(d->mType == Transport::EnumType::Akonadi);
-    return d->mAgentType;
-}
diff -Nru kmailtransport-16.12.3/src/transporttype.h kmailtransport-17.04.3/src/transporttype.h
--- kmailtransport-16.12.3/src/transporttype.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transporttype.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,128 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_TRANSPORTTYPE_H
-#define MAILTRANSPORT_TRANSPORTTYPE_H
-
-#include "mailtransport_export.h"
-#include "transport.h"
-
-#include <QtCore/QString>
-
-#include <agenttype.h>
-
-namespace MailTransport
-{
-
-class AddTransportDialog;
-class TransportManager;
-
-/**
-  @short A representation of a transport type.
-
-  Represents an available transport type.  SMTP is available, as well as
-  optionally a number of Akonadi-based types.  Each Akonadi-based type
-  corresponds to an Akonadi resource type that supports sending messages.
-
-  This class provides information about the type, such as name and
-  description.  Additionally, for Akonadi types, it provides the corresponding
-  Akonadi AgentType.
-
-  All available transport types can be retrieved via TransportManager::types().
-
-  @author Constantin Berzan <exit3219@gmail.com>
-  @since 4.4
-*/
-class MAILTRANSPORT_EXPORT TransportType
-{
-    friend class AddTransportDialog;
-    friend class Transport;
-    friend class TransportManager;
-    friend class TransportManagerPrivate;
-
-public:
-    /**
-      Describes a list of transport types.
-    */
-    typedef QList<TransportType> List;
-
-    /**
-      Constructs a new TransportType.
-    */
-    TransportType();
-
-    /**
-      Creates a copy of the @p other TransportType.
-    */
-    TransportType(const TransportType &other);
-
-    /**
-      Destroys the TransportType.
-    */
-    ~TransportType();
-
-    /**
-     * Replaces the transport type by the @p other.
-     */
-    TransportType &operator=(const TransportType &other);
-
-    /**
-     * Compares the transport type with the @p other.
-     */
-    bool operator==(const TransportType &other) const;
-
-    /**
-      Returns whether the transport type is valid.
-    */
-    bool isValid() const;
-
-    /**
-      @internal
-      Returns the type of the transport.
-    */
-    TransportBase::EnumType::type type() const;
-
-    /**
-      Returns the i18n'ed name of the transport type.
-    */
-    QString name() const;
-
-    /**
-      Returns a description of the transport type.
-    */
-    QString description() const;
-
-    /**
-      Returns the corresponding Akonadi::AgentType that this transport type
-      represents.  Only valid if type() is Transport::EnumType::Akonadi.
-    */
-    Akonadi::AgentType agentType() const;
-
-private:
-    //@cond PRIVATE
-    class Private;
-    QSharedDataPointer<Private> d;
-    //@endcond
-};
-
-} // namespace MailTransport
-
-Q_DECLARE_METATYPE(MailTransport::TransportType)
-
-#endif // MAILTRANSPORT_TRANSPORTTYPE_H
diff -Nru kmailtransport-16.12.3/src/transporttype_p.h kmailtransport-17.04.3/src/transporttype_p.h
--- kmailtransport-16.12.3/src/transporttype_p.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/transporttype_p.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MAILTRANSPORT_TRANSPORTTYPE_P_H
-#define MAILTRANSPORT_TRANSPORTTYPE_P_H
-
-#include <QtCore/QSharedData>
-#include <QtCore/QString>
-
-#include <agenttype.h>
-
-namespace MailTransport
-{
-
-/**
-  @internal
-*/
-class TransportType::Private : public QSharedData
-{
-public:
-    Private()
-    {
-        mType = -1;
-    }
-
-    Private(const Private &other)
-        : QSharedData(other)
-    {
-        mType = other.mType;
-        mName = other.mName;
-        mDescription = other.mDescription;
-        mAgentType = other.mAgentType;
-    }
-
-    int mType;
-    QString mName;
-    QString mDescription;
-    Akonadi::AgentType mAgentType;
-};
-
-} // namespace MailTransport
-
-#endif //MAILTRANSPORT_TRANSPORTTYPE_P_H
diff -Nru kmailtransport-16.12.3/src/ui/addtransportdialog.ui kmailtransport-17.04.3/src/ui/addtransportdialog.ui
--- kmailtransport-16.12.3/src/ui/addtransportdialog.ui	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/ui/addtransportdialog.ui	1970-01-01 00:00:00.000000000 +0000
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AddTransportDialog</class>
- <widget class="QWidget" name="AddTransportDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>482</width>
-    <height>353</height>
-   </rect>
-  </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>0</height>
-   </size>
-  </property>
-  <property name="windowTitle">
-   <string>Step One: Select Transport Type</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <property name="horizontalSpacing">
-    <number>0</number>
-   </property>
-   <item row="0" column="0">
-    <widget class="QLabel" name="label">
-     <property name="text">
-      <string comment="The name of a mail transport">Name:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1">
-    <widget class="QLineEdit" name="name"/>
-   </item>
-   <item row="1" column="1">
-    <widget class="QCheckBox" name="setDefault">
-     <property name="text">
-      <string>Make this the default outgoing account.</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QLabel" name="descLabel">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>Select an account type from the list below:</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2">
-    <widget class="QTreeWidget" name="typeListView">
-     <property name="alternatingRowColors">
-      <bool>true</bool>
-     </property>
-     <property name="rootIsDecorated">
-      <bool>false</bool>
-     </property>
-     <column>
-      <property name="text">
-       <string>Type</string>
-      </property>
-     </column>
-     <column>
-      <property name="text">
-       <string>Description</string>
-      </property>
-     </column>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff -Nru kmailtransport-16.12.3/src/ui/smtpsettings.ui kmailtransport-17.04.3/src/ui/smtpsettings.ui
--- kmailtransport-16.12.3/src/ui/smtpsettings.ui	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/ui/smtpsettings.ui	1970-01-01 00:00:00.000000000 +0000
@@ -1,576 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <author>Volker Krause &lt;vkrause@kde.org&gt;, KovoKs &lt;tomalbers@kde.nl&gt;</author>
- <class>SMTPSettings</class>
- <widget class="QWidget" name="SMTPSettings">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>411</width>
-    <height>474</height>
-   </rect>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <widget class="QTabWidget" name="tabWidget">
-     <property name="currentIndex">
-      <number>0</number>
-     </property>
-     <widget class="QWidget" name="smptTab">
-      <attribute name="title">
-       <string comment="general smtp settings">General</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="QGroupBox" name="groupBox">
-         <property name="title">
-          <string>Account Information</string>
-         </property>
-         <layout class="QGridLayout" name="gridLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="hostLabel">
-            <property name="text">
-             <string>Outgoing &amp;mail server:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-            <property name="buddy">
-             <cstring>kcfg_host</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="KLineEdit" name="kcfg_host">
-            <property name="trapEnterKeyEvent" stdset="0">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="usernameLabel">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>&amp;Login:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-            <property name="buddy">
-             <cstring>kcfg_userName</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="KLineEdit" name="kcfg_userName">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="trapEnterKeyEvent" stdset="0">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="passwordLabel">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>P&amp;assword:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-            <property name="buddy">
-             <cstring>password</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="KLineEdit" name="password">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="whatsThis">
-             <string>The password to send to the server for authorization.</string>
-            </property>
-            <property name="echoMode">
-             <enum>QLineEdit::Password</enum>
-            </property>
-            <property name="trapEnterKeyEvent" stdset="0">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1">
-           <widget class="QCheckBox" name="kcfg_storePassword">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>&amp;Store SMTP password</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QCheckBox" name="kcfg_requiresAuthentication">
-            <property name="text">
-             <string>Server &amp;requires authentication</string>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="advancedTab">
-      <attribute name="title">
-       <string comment="advanced smtp settings">Advanced</string>
-      </attribute>
-      <layout class="QVBoxLayout" name="verticalLayout_7">
-       <item>
-        <widget class="QGroupBox" name="encryptionGroup">
-         <property name="enabled">
-          <bool>true</bool>
-         </property>
-         <property name="title">
-          <string>Connection Settings</string>
-         </property>
-         <layout class="QVBoxLayout" name="verticalLayout_5">
-          <item>
-           <widget class="QStackedWidget" name="checkCapabilitiesStack">
-            <property name="currentIndex">
-             <number>0</number>
-            </property>
-            <widget class="QWidget" name="page">
-             <layout class="QVBoxLayout" name="verticalLayout_3">
-              <item>
-               <widget class="QPushButton" name="checkCapabilities">
-                <property name="text">
-                 <string>Auto Detect</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-            <widget class="QWidget" name="page_2">
-             <layout class="QVBoxLayout" name="verticalLayout_4">
-              <item>
-               <widget class="QProgressBar" name="checkCapabilitiesProgress">
-                <property name="value">
-                 <number>0</number>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </widget>
-           </widget>
-          </item>
-          <item>
-           <widget class="QLabel" name="noAuthPossible">
-            <property name="visible">
-             <bool>false</bool>
-            </property>
-            <property name="frameShape">
-             <enum>QFrame::Box</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Plain</enum>
-            </property>
-            <property name="lineWidth">
-             <number>0</number>
-            </property>
-            <property name="text">
-             <string>This server does not support authentication</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <layout class="QFormLayout" name="formLayout_2">
-            <property name="fieldGrowthPolicy">
-             <enum>QFormLayout::ExpandingFieldsGrow</enum>
-            </property>
-            <item row="0" column="0">
-             <widget class="QLabel" name="label">
-              <property name="text">
-               <string>Encryption:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <layout class="QHBoxLayout" name="encryptHLayout">
-              <item>
-               <widget class="QRadioButton" name="encryptionNone">
-                <property name="text">
-                 <string>&amp;None</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QRadioButton" name="encryptionSsl">
-                <property name="text">
-                 <string>&amp;SSL</string>
-                </property>
-               </widget>
-              </item>
-              <item>
-               <widget class="QRadioButton" name="encryptionTls">
-                <property name="text">
-                 <string>&amp;TLS</string>
-                </property>
-               </widget>
-              </item>
-             </layout>
-            </item>
-            <item row="1" column="0">
-             <widget class="QLabel" name="portLabel">
-              <property name="text">
-               <string>&amp;Port:</string>
-              </property>
-              <property name="alignment">
-               <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-              </property>
-              <property name="buddy">
-               <cstring>kcfg_port</cstring>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="1">
-             <widget class="QSpinBox" name="kcfg_port">
-              <property name="minimum">
-               <number>1</number>
-              </property>
-              <property name="maximum">
-               <number>65535</number>
-              </property>
-              <property name="value">
-               <number>25</number>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="0">
-             <widget class="QLabel" name="authLabel">
-              <property name="text">
-               <string>Authentication:</string>
-              </property>
-             </widget>
-            </item>
-            <item row="2" column="1">
-             <widget class="QComboBox" name="authCombo"/>
-            </item>
-           </layout>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="groupBox_2">
-         <property name="title">
-          <string>SMTP Settings</string>
-         </property>
-         <layout class="QFormLayout" name="formLayout">
-          <item row="0" column="0" colspan="2">
-           <widget class="QCheckBox" name="kcfg_specifyHostname">
-            <property name="text">
-             <string>Sen&amp;d custom hostname to server</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="hostnameLabel">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>Hostna&amp;me:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-            <property name="buddy">
-             <cstring>kcfg_localHostname</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="KLineEdit" name="kcfg_localHostname">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="trapEnterKeyEvent" stdset="0">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0" colspan="2">
-           <widget class="QCheckBox" name="kcfg_specifySenderOverwriteAddress">
-            <property name="text">
-             <string>Use custom sender address</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label_2">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="text">
-             <string>Sender Address:</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1">
-           <widget class="KLineEdit" name="kcfg_senderOverwriteAddress">
-            <property name="enabled">
-             <bool>false</bool>
-            </property>
-            <property name="trapEnterKeyEvent" stdset="0">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="0">
-           <widget class="QLabel" name="precommandLabel">
-            <property name="text">
-             <string>Precommand:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item row="4" column="1">
-           <widget class="KLineEdit" name="kcfg_precommand">
-            <property name="trapEnterKeyEvent" stdset="0">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <spacer name="verticalSpacer_2">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>0</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>KLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>klineedit.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>tabWidget</tabstop>
-  <tabstop>kcfg_host</tabstop>
-  <tabstop>kcfg_requiresAuthentication</tabstop>
-  <tabstop>kcfg_userName</tabstop>
-  <tabstop>password</tabstop>
-  <tabstop>kcfg_storePassword</tabstop>
-  <tabstop>checkCapabilities</tabstop>
-  <tabstop>encryptionNone</tabstop>
-  <tabstop>encryptionSsl</tabstop>
-  <tabstop>encryptionTls</tabstop>
-  <tabstop>authCombo</tabstop>
-  <tabstop>kcfg_specifyHostname</tabstop>
-  <tabstop>kcfg_localHostname</tabstop>
-  <tabstop>kcfg_specifySenderOverwriteAddress</tabstop>
-  <tabstop>kcfg_senderOverwriteAddress</tabstop>
-  <tabstop>kcfg_precommand</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>kcfg_specifyHostname</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>hostnameLabel</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>101</x>
-     <y>249</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>83</x>
-     <y>277</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>kcfg_specifyHostname</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>kcfg_localHostname</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>196</x>
-     <y>249</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>199</x>
-     <y>277</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>kcfg_requiresAuthentication</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>kcfg_userName</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>372</x>
-     <y>110</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>372</x>
-     <y>137</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>kcfg_requiresAuthentication</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>usernameLabel</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>372</x>
-     <y>110</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>141</x>
-     <y>137</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>kcfg_requiresAuthentication</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>passwordLabel</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>372</x>
-     <y>110</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>128</x>
-     <y>164</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>kcfg_requiresAuthentication</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>password</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>372</x>
-     <y>110</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>372</x>
-     <y>164</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>kcfg_requiresAuthentication</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>kcfg_storePassword</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>372</x>
-     <y>110</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>372</x>
-     <y>189</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>kcfg_specifySenderOverwriteAddress</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>label_2</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>59</x>
-     <y>299</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>78</x>
-     <y>312</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>kcfg_specifySenderOverwriteAddress</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>kcfg_senderOverwriteAddress</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>152</x>
-     <y>297</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>169</x>
-     <y>318</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff -Nru kmailtransport-16.12.3/src/ui/transportmanagementwidget.ui kmailtransport-17.04.3/src/ui/transportmanagementwidget.ui
--- kmailtransport-16.12.3/src/ui/transportmanagementwidget.ui	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/src/ui/transportmanagementwidget.ui	1970-01-01 00:00:00.000000000 +0000
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MailTransport::TransportManagementWidget</class>
- <widget class="QWidget" name="MailTransport::TransportManagementWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="3" column="1">
-    <widget class="QPushButton" name="removeButton">
-     <property name="text">
-      <string>Remo&amp;ve</string>
-     </property>
-    </widget>
-   </item>
-   <item row="5" column="1">
-    <widget class="QPushButton" name="defaultButton">
-     <property name="text">
-      <string>&amp;Set as Default</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="0" rowspan="7">
-    <widget class="TransportListView" name="transportList">
-     <property name="itemsExpandable">
-      <bool>false</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="1">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>141</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="1">
-    <widget class="QPushButton" name="addButton">
-     <property name="text">
-      <string>A&amp;dd...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QPushButton" name="renameButton">
-     <property name="text">
-      <string>&amp;Rename</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QPushButton" name="editButton">
-     <property name="text">
-      <string>&amp;Modify...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <widget class="KSeparator" name="kseparator"/>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>KSeparator</class>
-   <extends>QFrame</extends>
-   <header>kseparator.h</header>
-  </customwidget>
-  <customwidget>
-   <class>TransportListView</class>
-   <extends>QTreeWidget</extends>
-   <header location="global">transportlistview.h</header>
-  </customwidget>
- </customwidgets>
- <tabstops>
-  <tabstop>transportList</tabstop>
-  <tabstop>addButton</tabstop>
-  <tabstop>editButton</tabstop>
-  <tabstop>renameButton</tabstop>
-  <tabstop>removeButton</tabstop>
-  <tabstop>defaultButton</tabstop>
- </tabstops>
- <resources/>
- <connections/>
-</ui>
diff -Nru kmailtransport-16.12.3/tests/abort.cpp kmailtransport-17.04.3/tests/abort.cpp
--- kmailtransport-16.12.3/tests/abort.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/tests/abort.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,63 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "abort.h"
-
-#include <QTimer>
-
-#include <QApplication>
-#include <QDebug>
-
-#include <control.h>
-
-#include <dispatcherinterface.h>
-
-using namespace Akonadi;
-using namespace MailTransport;
-
-Runner::Runner()
-{
-    Control::start();
-
-    QTimer::singleShot(0, this, SLOT(sendAbort()));
-}
-
-void Runner::sendAbort()
-{
-    const AgentInstance mda = DispatcherInterface().dispatcherInstance();
-    if (!mda.isValid()) {
-        qDebug() << "Invalid instance; waiting.";
-        QTimer::singleShot(1000, this, SLOT(sendAbort()));
-        return;
-    }
-
-    mda.abortCurrentTask();
-    qDebug() << "Told the MDA to abort.";
-    QApplication::exit(0);
-}
-
-int main(int argc, char **argv)
-{
-    QApplication::setApplicationName(QStringLiteral("Abort"));
-    QApplication app(argc, argv);
-
-    new Runner();
-    return app.exec();
-}
-
diff -Nru kmailtransport-16.12.3/tests/abort.h kmailtransport-17.04.3/tests/abort.h
--- kmailtransport-16.12.3/tests/abort.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/tests/abort.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef ABORT_H
-#define ABORT_H
-
-#include <QObject>
-
-/**
-  This class uses the DispatcherInterface to send an abort() signal th the MDA.
-*/
-class Runner : public QObject
-{
-    Q_OBJECT
-
-public:
-    Runner();
-
-private Q_SLOTS:
-    void sendAbort();
-
-};
-
-#endif
diff -Nru kmailtransport-16.12.3/tests/clearerror.cpp kmailtransport-17.04.3/tests/clearerror.cpp
--- kmailtransport-16.12.3/tests/clearerror.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/tests/clearerror.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "clearerror.h"
-
-#include <QApplication>
-
-#include <collection.h>
-#include <control.h>
-#include <filteractionjob_p.h>
-#include <dispatcherinterface.h>
-#include <specialmailcollections.h>
-#include <specialmailcollectionsrequestjob.h>
-
-using namespace Akonadi;
-using namespace MailTransport;
-
-Runner::Runner()
-{
-    Control::start();
-
-    SpecialMailCollectionsRequestJob *rjob = new SpecialMailCollectionsRequestJob(this);
-    rjob->requestDefaultCollection(SpecialMailCollections::Outbox);
-    connect(rjob, &SpecialMailCollectionsRequestJob::result, this, &Runner::checkFolders);
-    rjob->start();
-}
-
-void Runner::checkFolders()
-{
-    DispatcherInterface().retryDispatching();
-}
-
-int main(int argc, char **argv)
-{
-    QApplication app(argc, argv);
-    app.setApplicationName(QStringLiteral("clearerror"));
-
-    new Runner();
-    return app.exec();
-}
-
diff -Nru kmailtransport-16.12.3/tests/clearerror.h kmailtransport-17.04.3/tests/clearerror.h
--- kmailtransport-16.12.3/tests/clearerror.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/tests/clearerror.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,40 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef CLEARERROR_H
-#define CLEARERROR_H
-
-#include <QObject>
-
-/**
-  This class uses the ClearErrorAction to mark all failed messages in the
-  outbox for immediate sending.
-*/
-class Runner : public QObject
-{
-    Q_OBJECT
-
-public:
-    Runner();
-
-private Q_SLOTS:
-    void checkFolders();
-};
-
-#endif
diff -Nru kmailtransport-16.12.3/tests/CMakeLists.txt kmailtransport-17.04.3/tests/CMakeLists.txt
--- kmailtransport-16.12.3/tests/CMakeLists.txt	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/tests/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,35 +0,0 @@
-
-include(ECMMarkAsTest)
-
-find_package(KF5TextWidgets ${KF5_VERSION} CONFIG REQUIRED)
-find_package(Qt5Test CONFIG REQUIRED)
-
-set(tm_srcs transportmgr.cpp)
-add_executable(transportmgr ${tm_srcs})
-ecm_mark_as_test(transportmgr)
-target_link_libraries(transportmgr KF5MailTransport Qt5::Widgets KF5::I18n KF5::ConfigGui KF5::Completion KF5::TextWidgets)
-
-add_executable(servertest servertest.cpp)
-ecm_mark_as_test(servertest)
-target_link_libraries(servertest KF5MailTransport KF5::I18n KF5::ConfigGui Qt5::Widgets)
-
-set(queuer_srcs queuer.cpp)
-add_executable(queuer ${queuer_srcs})
-ecm_mark_as_test(queuer)
-target_link_libraries(queuer KF5MailTransport Qt5::Widgets KF5::I18n KF5::ConfigGui KF5::Completion KF5::TextWidgets)
-
-set( sendqueued_srcs sendqueued.cpp )
-add_executable( sendqueued ${sendqueued_srcs} )
-ecm_mark_as_test(sendqueued)
-target_link_libraries( sendqueued KF5MailTransport  KF5::AkonadiMime Qt5::Widgets)
-
-set( clearerror_srcs clearerror.cpp )
-add_executable( clearerror ${clearerror_srcs} )
-ecm_mark_as_test(clearerror)
-target_link_libraries( clearerror KF5MailTransport  KF5::AkonadiMime Qt5::Widgets)
-
-set( abort_srcs abort.cpp )
-add_executable( abort ${abort_srcs} )
-ecm_mark_as_test(abort)
-target_link_libraries( abort KF5MailTransport KF5::AkonadiCore Qt5::Widgets)
-
diff -Nru kmailtransport-16.12.3/tests/queuer.cpp kmailtransport-17.04.3/tests/queuer.cpp
--- kmailtransport-16.12.3/tests/queuer.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/tests/queuer.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,188 +0,0 @@
-/*
-    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "queuer.h"
-
-#include <QDateTime>
-#include <QPointer>
-#include <QPushButton>
-
-#include <QApplication>
-#include <QDateTimeEdit>
-#include <QLineEdit>
-#include <KTextEdit>
-#include <QVBoxLayout>
-#include <control.h>
-
-#include <QDebug>
-#include <QDialog>
-#include <QDialogButtonBox>
-
-#include <dispatchmodeattribute.h>
-#include <messagequeuejob.h>
-#include <transportmanager.h>
-#include <transport.h>
-
-using namespace KMime;
-using namespace MailTransport;
-
-MessageQueuer::MessageQueuer()
-{
-    if (!Akonadi::Control::start()) {
-        qFatal("Could not start Akonadi server.");
-    }
-    QVBoxLayout *vbox = new QVBoxLayout;
-    vbox->setMargin(0);
-    setLayout(vbox);
-
-    mComboBox = new TransportComboBox(this);
-    mComboBox->setEditable(true);
-    vbox->addWidget(mComboBox);
-    mSenderEdit = new QLineEdit(this);
-    mSenderEdit->setPlaceholderText(QStringLiteral("Sender"));
-    vbox->addWidget(mSenderEdit);
-    mToEdit = new QLineEdit(this);
-    mToEdit->setText(QStringLiteral("idanoka@gmail.com"));
-    vbox->addWidget(mToEdit);
-    mToEdit->setPlaceholderText(QStringLiteral("To"));
-    mCcEdit = new QLineEdit(this);
-    vbox->addWidget(mCcEdit);
-    mCcEdit->setPlaceholderText(QStringLiteral("Cc"));
-    mBccEdit = new QLineEdit(this);
-    mBccEdit->setPlaceholderText(QStringLiteral("Bcc"));
-    vbox->addWidget(mBccEdit);
-    mMailEdit = new KTextEdit(this);
-    mMailEdit->setText(QStringLiteral("test from queuer!"));
-    mMailEdit->setAcceptRichText(false);
-    mMailEdit->setLineWrapMode(QTextEdit::NoWrap);
-    vbox->addWidget(mMailEdit);
-    QPushButton *b = new QPushButton(QStringLiteral("&Send Now"), this);
-    vbox->addWidget(b);
-    connect(b, &QPushButton::clicked, this, &MessageQueuer::sendNowClicked);
-    b = new QPushButton(QStringLiteral("Send &Queued"), this);
-    vbox->addWidget(b);
-    connect(b, &QPushButton::clicked, this, &MessageQueuer::sendQueuedClicked);
-    b = new QPushButton(QStringLiteral("Send on &Date..."), this);
-    vbox->addWidget(b);
-    connect(b, &QPushButton::clicked, this, &MessageQueuer::sendOnDateClicked);
-}
-
-void MessageQueuer::sendNowClicked()
-{
-    MessageQueueJob *qjob = createQueueJob();
-    qDebug() << "DispatchMode default (Automatic).";
-    qjob->start();
-}
-
-void MessageQueuer::sendQueuedClicked()
-{
-    MessageQueueJob *qjob = createQueueJob();
-    qDebug() << "DispatchMode Manual.";
-    qjob->dispatchModeAttribute().setDispatchMode(DispatchModeAttribute::Manual);
-    qjob->start();
-}
-
-void MessageQueuer::sendOnDateClicked()
-{
-    QPointer<QDialog> dialog = new QDialog(this);
-    auto layout = new QVBoxLayout(dialog);
-    QDateTimeEdit *dt = new QDateTimeEdit(dialog);
-    dt->setDateTime(QDateTime::currentDateTime());
-    dt->setDisplayFormat(QStringLiteral("hh:mm:ss"));
-    layout->addWidget(dt);
-    auto box = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-    connect(box, SIGNAL(accepted()), dialog, SLOT(accept()));
-    connect(box, SIGNAL(rejected()), dialog, SLOT(reject()));
-    layout->addWidget(box);
-    if (!dialog->exec() || !dialog) {
-        return;
-    }
-    qDebug() << "DispatchMode AfterDueDate" << dt->dateTime();
-    MessageQueueJob *qjob = createQueueJob();
-    qjob->dispatchModeAttribute().setDispatchMode(DispatchModeAttribute::Automatic);
-    qjob->dispatchModeAttribute().setSendAfter(dt->dateTime());
-    qjob->start();
-    delete dialog;
-}
-
-MessageQueueJob *MessageQueuer::createQueueJob()
-{
-    Message::Ptr msg = Message::Ptr(new Message);
-    // No headers; need a '\n' to separate headers from body.
-    // TODO: use real headers
-    msg->setContent(QByteArray("\n") + mMailEdit->document()->toPlainText().toLatin1());
-    qDebug() << "msg:" << msg->encodedContent(true);
-
-    MessageQueueJob *job = new MessageQueueJob();
-    job->setMessage(msg);
-    job->transportAttribute().setTransportId(mComboBox->currentTransportId());
-    // default dispatch mode
-    // default sent-mail collection
-    job->addressAttribute().setFrom(mSenderEdit->text());
-    job->addressAttribute().setTo(mToEdit->text().isEmpty() ?
-                                  QStringList() : mToEdit->text().split(QLatin1Char(',')));
-    job->addressAttribute().setCc(mCcEdit->text().isEmpty() ?
-                                  QStringList() : mCcEdit->text().split(QLatin1Char(',')));
-    job->addressAttribute().setBcc(mBccEdit->text().isEmpty() ?
-                                   QStringList() : mBccEdit->text().split(QLatin1Char(',')));
-
-    connect(job, SIGNAL(result(KJob*)),
-            SLOT(jobResult(KJob*)));
-    connect(job, SIGNAL(percent(KJob*,ulong)),
-            SLOT(jobPercent(KJob*,ulong)));
-    connect(job, SIGNAL(infoMessage(KJob*,QString,QString)),
-            SLOT(jobInfoMessage(KJob*,QString,QString)));
-
-    return job;
-}
-
-int main(int argc, char **argv)
-{
-    QApplication app(argc, argv);
-    app.setApplicationName(QStringLiteral("messagequeuer"));
-
-    MessageQueuer *t = new MessageQueuer();
-    t->show();
-    app.exec();
-    delete t;
-}
-
-void MessageQueuer::jobResult(KJob *job)
-{
-    if (job->error()) {
-        qDebug() << "job error:" << job->errorText();
-    } else {
-        qDebug() << "job success.";
-    }
-}
-
-void MessageQueuer::jobPercent(KJob *job, unsigned long percent)
-{
-    Q_UNUSED(job);
-    qDebug() << percent << "%";
-}
-
-void MessageQueuer::jobInfoMessage(KJob *job, const QString &info, const QString &info2)
-{
-    Q_UNUSED(job);
-    qDebug() << info;
-    qDebug() << info2;
-}
-
diff -Nru kmailtransport-16.12.3/tests/queuer.h kmailtransport-17.04.3/tests/queuer.h
--- kmailtransport-16.12.3/tests/queuer.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/tests/queuer.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,62 +0,0 @@
-/*
-    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef MESSAGEQUEUER_H
-#define MESSAGEQUEUER_H
-
-#include <QWidget>
-#include <transportcombobox.h>
-
-class KJob;
-class QLineEdit;
-class KTextEdit;
-
-namespace MailTransport
-{
-class MessageQueueJob;
-}
-
-/**
-  Mostly stolen from transportmgr.{h,cpp}
-*/
-class MessageQueuer : public QWidget
-{
-    Q_OBJECT
-
-public:
-    MessageQueuer();
-
-private Q_SLOTS:
-    void sendNowClicked();
-    void sendQueuedClicked();
-    void sendOnDateClicked();
-    void jobResult(KJob *job);
-    void jobPercent(KJob *job, unsigned long percent);
-    void jobInfoMessage(KJob *job, const QString &info, const QString &info2);
-
-private:
-    MailTransport::TransportComboBox *mComboBox;
-    QLineEdit *mSenderEdit, *mToEdit, *mCcEdit, *mBccEdit;
-    KTextEdit *mMailEdit;
-
-    MailTransport::MessageQueueJob *createQueueJob();
-};
-
-#endif
diff -Nru kmailtransport-16.12.3/tests/sendqueued.cpp kmailtransport-17.04.3/tests/sendqueued.cpp
--- kmailtransport-16.12.3/tests/sendqueued.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/tests/sendqueued.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,57 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "sendqueued.h"
-
-#include <QApplication>
-
-#include <collection.h>
-#include <control.h>
-#include <filteractionjob_p.h>
-#include <dispatcherinterface.h>
-#include <specialmailcollections.h>
-#include <specialmailcollectionsrequestjob.h>
-
-using namespace Akonadi;
-using namespace MailTransport;
-
-Runner::Runner()
-{
-    Control::start();
-
-    SpecialMailCollectionsRequestJob *rjob = new SpecialMailCollectionsRequestJob(this);
-    rjob->requestDefaultCollection(SpecialMailCollections::Outbox);
-    connect(rjob, &SpecialMailCollectionsRequestJob::result, this, &Runner::checkFolders);
-    rjob->start();
-}
-
-void Runner::checkFolders()
-{
-    DispatcherInterface().dispatchManually();
-}
-
-int main(int argc, char **argv)
-{
-    QApplication app(argc, argv);
-    app.setApplicationName(QStringLiteral("sendqueued"));
-
-    new Runner();
-    return app.exec();
-}
-
diff -Nru kmailtransport-16.12.3/tests/sendqueued.h kmailtransport-17.04.3/tests/sendqueued.h
--- kmailtransport-16.12.3/tests/sendqueued.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/tests/sendqueued.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,41 +0,0 @@
-/*
-    Copyright (c) 2009 Constantin Berzan <exit3219@gmail.com>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef SENDQUEUED_H
-#define SENDQUEUED_H
-
-#include <QObject>
-
-/**
-  This class uses the SendQueuedAction to mark all queued messages in the
-  outbox for immediate sending.
-*/
-class Runner : public QObject
-{
-    Q_OBJECT
-
-public:
-    Runner();
-
-private Q_SLOTS:
-    void checkFolders();
-
-};
-
-#endif
diff -Nru kmailtransport-16.12.3/tests/servertest.cpp kmailtransport-17.04.3/tests/servertest.cpp
--- kmailtransport-16.12.3/tests/servertest.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/tests/servertest.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-/*
-    Copyright (c) 2015 Volker Krause <vkrause@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "servertest.h"
-
-#include <QApplication>
-#include <QDebug>
-
-using namespace MailTransport;
-
-int main(int argc, char **argv)
-{
-    if (argc <= 2)
-        qFatal("Usage: servertest <protocol> <hostname>");
-
-    QApplication app(argc, argv);
-    app.setApplicationName(QStringLiteral("kmailtransport-servertest"));
-
-    ServerTest test;
-    test.setProtocol(app.arguments().at(1));
-    test.setServer(app.arguments().at(2));
-    test.start();
-    QObject::connect(&test, &ServerTest::finished, [](const QList<int> &encs) {
-        qDebug() << encs;
-        QCoreApplication::quit();
-    });
-    return app.exec();
-}
-
diff -Nru kmailtransport-16.12.3/tests/transportmgr.cpp kmailtransport-17.04.3/tests/transportmgr.cpp
--- kmailtransport-16.12.3/tests/transportmgr.cpp	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/tests/transportmgr.cpp	1970-01-01 00:00:00.000000000 +0000
@@ -1,159 +0,0 @@
-/*
-    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#include "transportmgr.h"
-
-#include <transportconfigdialog.h>
-#include <transportmanager.h>
-#include <transportmanagementwidget.h>
-#include <transportjob.h>
-#include <transport.h>
-#include <QVBoxLayout>
-
-#include <QApplication>
-#include <QLineEdit>
-#include <QDebug>
-#include <KTextEdit>
-
-#include <QPushButton>
-
-using namespace MailTransport;
-
-TransportMgr::TransportMgr() :
-    mCurrentJob(0)
-{
-    QVBoxLayout *vbox = new QVBoxLayout;
-    vbox->setMargin(0);
-    setLayout(vbox);
-
-    vbox->addWidget(new TransportManagementWidget(this));
-    mComboBox = new TransportComboBox(this);
-    mComboBox->setEditable(true);
-    vbox->addWidget(mComboBox);
-    QPushButton *b = new QPushButton(QStringLiteral("&Edit"), this);
-    vbox->addWidget(b);
-    connect(b, &QPushButton::clicked, this, &TransportMgr::editBtnClicked);
-    b = new QPushButton(QStringLiteral("&Remove all transports"), this);
-    vbox->addWidget(b);
-    connect(b, &QPushButton::clicked, this, &TransportMgr::removeAllBtnClicked);
-    mSenderEdit = new QLineEdit(this);
-    mSenderEdit->setPlaceholderText(QStringLiteral("Sender"));
-    vbox->addWidget(mSenderEdit);
-    mToEdit = new QLineEdit(this);
-    mToEdit->setPlaceholderText(QStringLiteral("To"));
-    vbox->addWidget(mToEdit);
-    mCcEdit = new QLineEdit(this);
-    mCcEdit->setPlaceholderText(QStringLiteral("Cc"));
-    vbox->addWidget(mCcEdit);
-    mBccEdit = new QLineEdit(this);
-    mBccEdit->setPlaceholderText(QStringLiteral("Bcc"));
-    vbox->addWidget(mBccEdit);
-    mMailEdit = new KTextEdit(this);
-    mMailEdit->setAcceptRichText(false);
-    mMailEdit->setLineWrapMode(QTextEdit::NoWrap);
-    vbox->addWidget(mMailEdit);
-    b = new QPushButton(QStringLiteral("&Send"), this);
-    connect(b, &QPushButton::clicked, this, &TransportMgr::sendBtnClicked);
-    vbox->addWidget(b);
-    b = new QPushButton(QStringLiteral("&Cancel"), this);
-    connect(b, &QPushButton::clicked, this, &TransportMgr::cancelBtnClicked);
-    vbox->addWidget(b);
-}
-
-void TransportMgr::removeAllBtnClicked()
-{
-    MailTransport::TransportManager *manager =  MailTransport::TransportManager::self();
-    QList<Transport *> transports = manager->transports();
-    for (int i = 0; i < transports.count(); i++) {
-        MailTransport::Transport *transport = transports.at(i);
-        qDebug() << transport->host();
-        manager->removeTransport(transport->id());
-    }
-}
-
-void TransportMgr::editBtnClicked()
-{
-    const int index = mComboBox->currentTransportId();
-    if (index < 0) {
-        return;
-    }
-    TransportManager::self()->configureTransport(TransportManager::self()->transportById(index), this);
-}
-
-void TransportMgr::sendBtnClicked()
-{
-    TransportJob *job;
-    job = TransportManager::self()->createTransportJob(mComboBox->currentTransportId());
-    if (!job) {
-        qDebug() << "Invalid transport!";
-        return;
-    }
-    job->setSender(mSenderEdit->text());
-    job->setTo(mToEdit->text().isEmpty() ? QStringList() : mToEdit->text().split(QLatin1Char(',')));
-    job->setCc(mCcEdit->text().isEmpty() ? QStringList() : mCcEdit->text().split(QLatin1Char(',')));
-    job->setBcc(mBccEdit->text().isEmpty() ? QStringList() : mBccEdit->text().split(QLatin1Char(',')));
-    job->setData(mMailEdit->document()->toPlainText().toLatin1());
-    connect(job, SIGNAL(result(KJob*)),
-            SLOT(jobResult(KJob*)));
-    connect(job, SIGNAL(percent(KJob*,ulong)),
-            SLOT(jobPercent(KJob*,ulong)));
-    connect(job, SIGNAL(infoMessage(KJob*,QString,QString)),
-            SLOT(jobInfoMessage(KJob*,QString,QString)));
-    mCurrentJob = job;
-    TransportManager::self()->schedule(job);
-}
-
-void TransportMgr::cancelBtnClicked()
-{
-    if (mCurrentJob) {
-        qDebug() << "kill success:" << mCurrentJob->kill();
-    }
-    mCurrentJob = 0;
-}
-
-int main(int argc, char **argv)
-{
-    QApplication app(argc, argv);
-    app.setApplicationName(QStringLiteral("transportmgr"));
-
-    TransportMgr *t = new TransportMgr();
-    t->show();
-    app.exec();
-    delete t;
-}
-
-void TransportMgr::jobResult(KJob *job)
-{
-    qDebug() << job->error() << job->errorText();
-    mCurrentJob = 0;
-}
-
-void TransportMgr::jobPercent(KJob *job, unsigned long percent)
-{
-    Q_UNUSED(job);
-    qDebug() << percent << "%";
-}
-
-void TransportMgr::jobInfoMessage(KJob *job, const QString &info, const QString &info2)
-{
-    Q_UNUSED(job);
-    qDebug() << info;
-    qDebug() << info2;
-}
-
diff -Nru kmailtransport-16.12.3/tests/transportmgr.h kmailtransport-17.04.3/tests/transportmgr.h
--- kmailtransport-16.12.3/tests/transportmgr.h	2017-02-14 12:35:31.000000000 +0000
+++ kmailtransport-17.04.3/tests/transportmgr.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,55 +0,0 @@
-/*
-    Copyright (c) 2006 - 2007 Volker Krause <vkrause@kde.org>
-
-    This library is free software; you can redistribute it and/or modify it
-    under the terms of the GNU Library General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or (at your
-    option) any later version.
-
-    This library is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Library General Public
-    License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    along with this library; see the file COPYING.LIB.  If not, write to the
-    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA.
-*/
-
-#ifndef TRANSPORTMGR_H
-#define TRANSPORTMGR_H
-
-#define USES_DEPRECATED_MAILTRANSPORT_API
-
-#include <QWidget>
-#include <transportcombobox.h>
-
-class KJob;
-class QLineEdit;
-class KTextEdit;
-
-class TransportMgr : public QWidget
-{
-    Q_OBJECT
-
-public:
-    TransportMgr();
-
-private Q_SLOTS:
-    void removeAllBtnClicked();
-    void editBtnClicked();
-    void sendBtnClicked();
-    void cancelBtnClicked();
-    void jobResult(KJob *job);
-    void jobPercent(KJob *job, unsigned long percent);
-    void jobInfoMessage(KJob *job, const QString &info, const QString &info2);
-
-private:
-    MailTransport::TransportComboBox *mComboBox;
-    QLineEdit *mSenderEdit, *mToEdit, *mCcEdit, *mBccEdit;
-    KTextEdit *mMailEdit;
-    KJob *mCurrentJob;
-};
-
-#endif