Commit f0620dea authored by Laurent Montel's avatar Laurent Montel 😁

Merge branch 'master' of git://anongit.kde.org/kdepim-runtime

parents 3c55223d 675f6045
......@@ -6,6 +6,7 @@ Name[ca@valencia]=ownCloud (> 5.0 i < 9.0)
Name[cs]=ownCloud (> 5.0 a < 9.0)
Name[da]=ownCloud (> 5.0 og < 9.0)
Name[de]=ownCloud (> 5.0 and < 9.0)
Name[el]=ownCloud (> 5.0 and < 9.0)
Name[en_GB]=ownCloud (> 5.0 and < 9.0)
Name[es]=ownCloud (> 5.0 y < 9.0)
Name[et]=ownCloud (> 5.0 ja < 9.0)
......
......@@ -4,6 +4,7 @@ Name[ca]=Fitxer de calendari iCal
Name[ca@valencia]=Fitxer de calendari iCal
Name[cs]=Soubor s kalendářem iCal
Name[de]=ICal-Kalenderdatei
Name[el]=Αρχείο ημερολογίου iCal
Name[en_GB]=iCal Calendar File
Name[es]=Archivo de calendario iCal
Name[it]=File di calendario iCal
......
......@@ -4,6 +4,7 @@ Name[ca]=Fitxer de calendari iCal
Name[ca@valencia]=Fitxer de calendari iCal
Name[cs]=Soubor s kalendářem iCal
Name[de]=ICal-Kalenderdatei
Name[el]=Αρχείο ημερολογίου iCal
Name[en_GB]=iCal Calendar File
Name[es]=Archivo de calendario iCal
Name[it]=File di calendario iCal
......
......@@ -4,6 +4,7 @@ Name[ca]=Carpeta de calendari iCal
Name[ca@valencia]=Carpeta de calendari iCal
Name[cs]=Složka kalendáře iCal
Name[de]=ICal-Kalenderordner
Name[el]=Φάκελος ημερολογίου iCal
Name[en_GB]=iCal Calendar Folder
Name[es]=Carpeta de calendario iCal
Name[it]=Cartella di calendario iCal
......
......@@ -23,6 +23,7 @@
#include "imapaccount.h"
#include "utils.h"
#include "config.h"
#include <kwallet.h>
using KWallet::Wallet;
......@@ -78,6 +79,17 @@ Settings::Settings(WId winId) : SettingsBase(), m_winId(winId)
{
load();
#ifdef WITH_GMAIL_XOAUTH2
// Make sure that Gmail configuration is correctly migrated even if the user
// did not open the configuration dialog
if (Utils::isGmail(imapServer())) {
setImapPort(993);
setSafety(QStringLiteral("SSL"));
setAuthentication(MailTransport::Transport::EnumAuthenticationType::XOAUTH2);
save();
}
#endif
new SettingsAdaptor(this);
QDBusConnection::sessionBus().registerObject(QStringLiteral("/Settings"), this, QDBusConnection::ExportAdaptors | QDBusConnection::ExportScriptableContents);
}
......
......@@ -569,10 +569,12 @@ void SetupServer::slotTestChanged()
m_serverTest = nullptr;
slotSafetyChanged();
#ifdef WITH_GMAIL_XOAUTH2
// do not use imapConnectionPossible, as the data is not yet saved.
const bool isGmail = Utils::isGmail(m_ui->imapServer->text());
m_ui->testButton->setEnabled(!isGmail /* TODO && Global::connectionPossible() ||
m_ui->imapServer->text() == "localhost"*/);
#endif
}
void SetupServer::slotEnableWidgets()
......@@ -594,6 +596,7 @@ void SetupServer::slotComplete()
void SetupServer::slotSafetyChanged()
{
#ifdef WITH_GMAIL_XOAUTH2
if (m_serverTest == nullptr) {
const bool isGmail = Utils::isGmail(m_ui->imapServer->text());
qCDebug(IMAPRESOURCE_LOG) << "serverTest null";
......@@ -604,7 +607,7 @@ void SetupServer::slotSafetyChanged()
m_ui->authenticationCombo->setEnabled(!isGmail);
return;
}
#endif
QVector<int> protocols;
switch (m_ui->safeImapGroup->checkedId()) {
......@@ -704,13 +707,16 @@ void SetupServer::populateDefaultAuthenticationOptions(QComboBox *combo)
addAuthenticationItem(combo, MailTransport::Transport::EnumAuthenticationType::NTLM);
addAuthenticationItem(combo, MailTransport::Transport::EnumAuthenticationType::GSSAPI);
addAuthenticationItem(combo, MailTransport::Transport::EnumAuthenticationType::ANONYMOUS);
#ifdef WITH_GMAIL_XOAUTH2
if (Utils::isGmail(m_ui->imapServer->text())) {
addAuthenticationItem(combo, MailTransport::Transport::EnumAuthenticationType::XOAUTH2);
}
#endif
}
void SetupServer::slotServerChanged()
{
#ifdef WITH_GMAIL_XOAUTH2
const bool isGmail = Utils::isGmail(m_ui->imapServer->text());
const bool wasGmail = !m_ui->password->isEnabled();
......@@ -733,4 +739,5 @@ void SetupServer::slotServerChanged()
setCurrentAuthMode(m_ui->authenticationCombo, MailTransport::Transport::EnumAuthenticationType::XOAUTH2);
}
m_ui->authenticationCombo->setEnabled(!isGmail);
#endif
}
......@@ -4,8 +4,11 @@ Comment=POP3 Resource
Comment[ca]=Recurs POP3
Comment[ca@valencia]=Recurs POP3
Comment[cs]=Zdroj POP3
Comment[el]=Πόρος POP3
Comment[nl]=POP3-hulpbron
Comment[pl]=Zasób POP3
Comment[pt]=Recurso de POP3
Comment[sk]=Zdroj POP3
Comment[sv]=POP3-resurs
Comment[uk]=Ресурс POP3
Comment[x-test]=xxPOP3 Resourcexx
......@@ -34,6 +37,7 @@ Name[pl]=Błąd podczas sprawdzania poczty
Name[pt]=Erro na Verificação do Correio
Name[ro]=Eroare la verificarea poștei
Name[ru]=Не удалось проверить почту
Name[sk]=Počas kontroly pošty nastala chyba
Name[sv]=Fel vid kontroll av post
Name[tr]=E-posta Kontrol Edilirken Hata Oluştu
Name[uk]=Помилка під час спроби отримання пошти
......@@ -63,6 +67,7 @@ Comment[pl]=Podczas sprawdzania poczty wystąpił błąd
Comment[pt]=Ocorreu um erro ao verificar o correio novo
Comment[ro]=A avut loc o eroare la verificarea pentru mesaje noi
Comment[ru]=При проверке наличия новой почты произошла ошибка.
Comment[sk]=Došlo k chybe pri kontrole novej pošty
Comment[sv]=Ett fel uppstod vid kontroll av ny post
Comment[tr]=Yeni e-postalar denetlenirken bir hata oluştu
Comment[uk]=Під час спроби перевірки наявності нової пошти сталася помилка
......
......@@ -5,6 +5,7 @@ Name[ca@valencia]=Recurs TomboyNotes per a l'Akonadi
Name[cs]=Zdroj Akonadi TomboyNotes
Name[da]=Akonadi TomboyNotes-ressource
Name[de]=Akonadi-TomboyNotes-Ressource
Name[el]=Πόρος Akonadi TomboyNotes
Name[en_GB]=Akonadi TomboyNotes Resource
Name[es]=Recurso de notas de Tomboy de Akonadi
Name[et]=Akonadi Tomboy sedelite ressurss
......@@ -31,6 +32,7 @@ Comment[ca]=Recurs per a Tomboy compatible amb el servidor de notes
Comment[ca@valencia]=Recurs per a Tomboy compatible amb el servidor de notes
Comment[da]=Ressource til Tomboy-kompatible noteservere
Comment[de]=Ressource für Tomboy-kompatiblen Notizen-Server
Comment[el]=Πόρος για συμβατότητα του Tomboy με εξυπηρετητή σημειώσεων
Comment[en_GB]=Resource for Tomboy compatible notes server
Comment[es]=Recurso para un servidor de notas compatible con Tomboy
Comment[et]=Tomboyga ühilduvate sedelite serveri ressurss
......
......@@ -47,6 +47,7 @@ Comment[ca@valencia]=Carrega els contactes des d'un directori vCard
Comment[cs]=Načítá data z adresáře vizitek
Comment[da]=Indlæser kontakt fra vCard-mappe
Comment[de]=Lädt Kontakt aus einem vCard-Ordner
Comment[el]=Φορτώνει επαφή από κατάλογο vCard
Comment[en_GB]=Loads contact from vCard Directory
Comment[es]=Carga contactos desde un directorio vCard
Comment[et]=Kontakti laadimine vCardide kataloogist
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment