Commit 732d76fd authored by Yuri Chornoivan's avatar Yuri Chornoivan Committed by Michael Reeves

Use separate label for the 'Merge' settings page to distinguish it from button labels

parent 364cca26
...@@ -923,7 +923,7 @@ void OptionDialog::setupDiffPage() ...@@ -923,7 +923,7 @@ void OptionDialog::setupDiffPage()
void OptionDialog::setupMergePage() void OptionDialog::setupMergePage()
{ {
QFrame* page = new QFrame(); QFrame* page = new QFrame();
KPageWidgetItem* pageItem = new KPageWidgetItem(page, i18n("Merge")); KPageWidgetItem* pageItem = new KPageWidgetItem(page, i18nc("Settings page", "Merge"));
pageItem->setHeader(i18n("Merge Settings")); pageItem->setHeader(i18n("Merge Settings"));
pageItem->setIcon(QIcon::fromTheme(QStringLiteral("merge"))); pageItem->setIcon(QIcon::fromTheme(QStringLiteral("merge")));
addPage(pageItem); addPage(pageItem);
......
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