[pim/kontact] src: Fix KUIT problems
Allen Winter <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit ecb09b9fe101ad981eb853b4d357c7ec2ed09f89 by Allen Winter.
Committed on 26/07/2026 at 14:38.
Pushed by winterz into branch 'master'.
Fix KUIT problems
M +3 -2 src/ksettingsdialog/kontactkcmultidialog.cpp
M +6 -6 src/main.cpp
M +12 -11 src/mainwindow.cpp
https://invent.kde.org/pim/kontact/-/commit/ecb09b9fe101ad981eb853b4d357c7ec2ed09f89
diff --git a/src/ksettingsdialog/kontactkcmultidialog.cpp b/src/ksettingsdialog/kontactkcmultidialog.cpp
index 91f2da36..6aa6e815 100644
--- a/src/ksettingsdialog/kontactkcmultidialog.cpp
+++ b/src/ksettingsdialog/kontactkcmultidialog.cpp
@@ -42,8 +42,9 @@ bool KontactKCMultiDialogPrivate::resolveChanges(KCModule *currentProxy)
// Let the user decide
const int queryUser = KMessageBox::warningTwoActionsCancel(q,
- i18n("The settings of the current module have changed.\n"
- "Do you want to apply the changes or discard them?"),
+ i18nc("@info",
+ "The settings of the current module have changed.<nl/>"
+ "Do you want to apply the changes or discard them?"),
i18nc("@title:window", "Apply Settings"),
KStandardGuiItem::apply(),
KStandardGuiItem::discard(),
diff --git a/src/main.cpp b/src/main.cpp
index b39bd088..11e518df 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -96,7 +96,7 @@ static void listPlugins()
static void loadCommandLineOptions(QCommandLineParser *parser)
{
- parser->addOption(QCommandLineOption(u"module"_s, i18nc("@info:shell", "Start with a specific Kontact module"), i18n("Module")));
+ parser->addOption(QCommandLineOption(u"module"_s, i18nc("@info:shell", "Start with a specific Kontact module"), i18nc("@info:shell", "Module")));
parser->addOption(QCommandLineOption(u"iconify"_s, i18nc("@info:shell", "Start in iconified (minimized) mode")));
parser->addOption(QCommandLineOption(u"list"_s, i18nc("@info:shell", "List all possible modules and exit")));
}
@@ -154,11 +154,11 @@ int main(int argc, char **argv)
KStyleManager::initStyle();
KAboutData about(u"kontact"_s,
- i18n("Kontact"),
+ i18nc("@info/plain", "Kontact"),
QLatin1StringView(version),
- i18n("KDE personal information manager"),
+ i18nc("@info/plain", "KDE personal information manager"),
KAboutLicense::GPL,
- i18n("Copyright © 2001–%1 Kontact authors", u"2026"_s),
+ i18nc("@info/plain", "Copyright © 2001–%1 Kontact authors", u"2026"_s),
QString(),
u"https://userbase.kde.org/Kontact"_s);
@@ -172,8 +172,8 @@ int main(int argc, char **argv)
about.addAuthor(i18nc("@info:credit", "Ingo Kl\303\266cker"), QString(), u"[email protected]"_s);
about.addAuthor(i18nc("@info:credit", "Sven L\303\274ppken"), QString(), u"[email protected]"_s);
about.addAuthor(i18nc("@info:credit", "Zack Rusin"), QString(), u"[email protected]"_s);
- about.addAuthor(i18nc("@info:credit", "Matthias Hoelzer-Kluepfel"), i18n("Original Author"), u"[email protected]"_s);
- about.addCredit(i18nc("@info:credit", "Torgny Nyblom"), i18n("Git Migration"), u"[email protected]"_s);
+ about.addAuthor(i18nc("@info:credit", "Matthias Hoelzer-Kluepfel"), i18nc("@info:credit", "Original Author"), u"[email protected]"_s);
+ about.addCredit(i18nc("@info:credit", "Torgny Nyblom"), i18nc("@info:credit", "Git Migration"), u"[email protected]"_s);
app.setAboutData(about);
app.setWindowIcon(QIcon::fromTheme(u"kontact"_s));
app.setDesktopFileName(u"org.kde.kontact"_s);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 34894f6e..bb1be5af 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -365,9 +365,10 @@ void MainWindow::slotToggleMenubar(bool dontShowWarning)
if (!dontShowWarning && (!toolBar()->isVisible() /* || !toolBar()->actions().contains(mHamburgerMenu)*/)) {
const QString accel = mShowMenuBarAction->shortcut().toString(QKeySequence::NativeText);
KMessageBox::information(this,
- i18n("<qt>This will hide the menu bar completely."
- " You can show it again by typing %1.</qt>",
- accel),
+ i18nc("@info",
+ "This will hide the menu bar completely."
+ " You can show it again by typing %1.",
+ accel),
i18nc("@title:window", "Hide menu bar"),
u"HideMenuBarWarning"_s);
}
@@ -974,22 +975,22 @@ QVariantHash MainWindow::introductionData()
{
QVariantHash data;
data[u"icon"_s] = u"kontact"_s;
- data[u"name"_s] = i18n("Kontact");
- data[u"subtitle"_s] = i18n("The KDE Personal Information Management Suite.");
+ data[u"name"_s] = i18nc("@info/plain", "Kontact");
+ data[u"subtitle"_s] = i18nc("@info/plain", "The KDE Personal Information Management Suite.");
data[u"version"_s] = KAboutData::applicationData().version();
const QVariantList links = {QVariantHash{{u"url"_s, u"exec:/help?org.kde.kontact"_s},
{u"icon"_s, u"help-contents"_s},
- {u"title"_s, i18n("Read Manual")},
- {u"subtext"_s, i18n("Learn more about Kontact and its components")}},
+ {u"title"_s, i18nc("@info/plain", "Read Manual")},
+ {u"subtext"_s, i18nc("@info/plain", "Learn more about Kontact and its components")}},
QVariantHash{{u"url"_s, u"https://kontact.kde.org"_s},
{u"icon"_s, u"kontact"_s},
- {u"title"_s, i18n("Visit Kontact Website")},
- {u"subtext"_s, i18n("Access online resources and tutorials")}},
+ {u"title"_s, i18nc("@info/plain", "Visit Kontact Website")},
+ {u"subtext"_s, i18nc("@info/plain", "Access online resources and tutorials")}},
QVariantHash{{u"url"_s, u"exec:/accountwizard"_s},
{u"icon"_s, u"tools-wizard"_s},
- {u"title"_s, i18n("Setup your Accounts")},
- {u"subtext"_s, i18n("Prepare Kontact for use")}}};
+ {u"title"_s, i18nc("@info/plain", "Setup your Accounts")},
+ {u"subtext"_s, i18nc("@info/plain", "Prepare Kontact for use")}}};
data[u"links"_s] = links;
return data;