Merge remote-tracking branch 'origin/release/20.08'

kcms/ldap/kcmldap.desktop

@@ -77,6 +77,7 @@ X-KDE-Keywords[es]=kaddressbook, configurar, preferencias, LDAP
 X-KDE-Keywords[et]=kde aadressiraamat, seadistamine, seadistused, LDAP
 X-KDE-Keywords[fi]=kaddressbook, asetukset, LDAP
 X-KDE-Keywords[fr]=KAddressBook, configurer, paramètres, « LDAP »
+X-KDE-Keywords[ia]=kaddressbook, configura, preferentias, LDAP
 X-KDE-Keywords[it]=kaddressbook, configurazione, impostazioni, LDAP
 X-KDE-Keywords[ko]=kaddressbook, configure, settings, LDAP, 설정, 주소록
 X-KDE-Keywords[nl]=kaddressbook, configureren, instellingen, LDAP

resources/google-groupware/googleresource.desktop

@@ -8,6 +8,7 @@ Name[es]=Google Groupware
 Name[et]=Google Groupware
 Name[fi]=Google Groupware
 Name[fr]=Logiciel de groupe de travail « Google Groupware »
+Name[ia]=Google Groupware
 Name[it]=Google Groupware
 Name[ko]=Google 그룹웨어
 Name[nl]=Google Groupware
@@ -22,19 +23,15 @@ Comment=Access your Google Calendars, Contacts and Tasks from KDE
 Comment[ca]=Accediu als calendaris, contactes i tasques de Google des del KDE
 Comment[ca@valencia]=Accediu als calendaris, contactes i tasques de Google des del KDE
 Comment[cs]=Přistupujte ke k kalendářům, kontaktům a úkolům z KDE
-Comment[de]=Greifen Sie in KDE auf Ihre Google-Kalender, -Kontakte und -Aufgaben zu
-Comment[en_GB]=Access your Google Calendars, Contacts and Tasks from KDE
 Comment[es]=Acceda a sus calendarios, contactos y tareas de Google desde KDE
 Comment[et]=Oma Google'i kalendrite, kontaktide ja ülesannete kasutamine otse KDE-st
 Comment[fi]=Pääsy Googlen kalentereihin ja tehtäviin KDE:sta
 Comment[fr]=Accès à vos agendas, contacts et tâches Google depuis KDE
+Comment[ia]=Accede a tu Calendarios, Contactos  e Cargas de Google ab KDE
 Comment[it]=Accedi ai tuoi calendari, contatti e attività Google da KDE
-Comment[ko]=KDE에서 Google 캘린더, 연락처, 할 일에 접근합니다
 Comment[nl]=Heb toegang tot uw Google agenda's, contactpersonen en taken vanuit KDE
 Comment[pt]=Aceda aos seus calendários, contactos e tarefas da Google a partir do KDE
 Comment[pt_BR]=Acesse seus calendários, contatos e tarefas do Google a partir do KDE
-Comment[ru]=Доступ к контактам, задачам и календарям Google из KDE
-Comment[sl]=Dostopajte do svojih Googlovih koledarjev, stikov in opravil iz okolja KDE
 Comment[sv]=Kom åt Google kalendrar, kontakter och uppgifter från KDE
 Comment[uk]=Доступ до ваших календарів, записів контактів і завдань Google з KDE
 Comment[x-test]=xxAccess your Google Calendars, Contacts and Tasks from KDExx

resources/pop3/accountwidget.cpp

@@ -77,10 +77,6 @@ AccountWidget::AccountWidget(Settings &settings, const QString &identifier, QWid
     , mSettings(settings)
 {
     mValidator.setRegExp(QRegExp(QLatin1String("[A-Za-z0-9-_:.]*")));
-    new KPIM::LineEditCatchReturnKey(nameEdit, this);
-    new KPIM::LineEditCatchReturnKey(hostEdit, this);
-    new KPIM::LineEditCatchReturnKey(loginEdit, this);
-    new KPIM::LineEditCatchReturnKey(precommand, this);
     setupWidgets();
 }
 
@@ -108,6 +104,11 @@ void AccountWidget::setupWidgets()
 
     intervalSpin->setRange(ResourceSettings::self()->minimumCheckInterval(), 10000);
     intervalSpin->setSingleStep(1);
+    new KPIM::LineEditCatchReturnKey(nameEdit, this);
+    new KPIM::LineEditCatchReturnKey(hostEdit, this);
+    new KPIM::LineEditCatchReturnKey(loginEdit, this);
+    new KPIM::LineEditCatchReturnKey(precommand, this);
+
 
     connect(leaveOnServerCheck, &QCheckBox::clicked, this, &AccountWidget::slotLeaveOnServerClicked);
     connect(leaveOnServerDaysCheck, &QCheckBox::toggled, this, &AccountWidget::slotEnableLeaveOnServerDays);