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

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

parents 82312223 80d8a0c2
Pipeline #37987 passed with stage
in 42 minutes and 24 seconds
......@@ -672,6 +672,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab(QWidget *parent)
i18n("A&dd..."), i18n("Re&move"),
i18n("Mod&ify..."),
i18n("Enter new reply prefix:"));
mReplyListEditor->setRemoveDialogLabel(i18n("Do you want to remove reply prefix?"));
connect(mReplyListEditor, &PimCommon::SimpleStringListEditor::changed, this, &ConfigModuleTab::slotEmitChanged);
// row 2: "replace [...]" check box:
......@@ -701,6 +702,7 @@ ComposerPageSubjectTab::ComposerPageSubjectTab(QWidget *parent)
i18n("Remo&ve"),
i18n("Modify..."),
i18n("Enter new forward prefix:"));
mForwardListEditor->setRemoveDialogLabel(i18n("Do you want to remove forward prefix?"));
connect(mForwardListEditor, &PimCommon::SimpleStringListEditor::changed, this, &ConfigModuleTab::slotEmitChanged);
// row 3: "replace [...]" check box:
......@@ -1147,6 +1149,7 @@ ComposerPageAttachmentsTab::ComposerPageAttachmentsTab(QWidget *parent)
i18n("A&dd..."), i18n("Re&move"),
i18n("Mod&ify..."),
i18n("Enter new key word:"));
mAttachWordsListEditor->setRemoveDialogLabel(i18n("Do you want to remove this attachment word?"));
connect(mAttachWordsListEditor, &PimCommon::SimpleStringListEditor::changed, this, &ConfigModuleTab::slotEmitChanged);
vlay->addWidget(mAttachWordsListEditor);
......
......@@ -88,6 +88,7 @@ SecurityPageGeneralTab::SecurityPageGeneralTab(QWidget *parent)
connect(mSGTab.mCheckMailUrlTracking, &QCheckBox::stateChanged, this, &SecurityPageGeneralTab::slotEmitChanged);
connect(mSGTab.scamWhiteList, &PimCommon::SimpleStringListEditor::changed, this, &ConfigModuleTab::slotEmitChanged);
mSGTab.scamWhiteList->setAddDialogLabel(i18n("Email Address:"));
mSGTab.scamWhiteList->setRemoveDialogLabel(i18n("Do you want to remove this email address?"));
}
void SecurityPageGeneralTab::slotLinkClicked(const QString &link)
......
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