diff --git a/src/Application.cpp b/src/Application.cpp
index 7bd76ee7..24360ad9 100644
--- a/src/Application.cpp
+++ b/src/Application.cpp
@@ -73,7 +73,7 @@ void Application::populateCommandLineParser(QCommandLineParser *parser)
                                         i18nc("@info:shell", "Start Konsole in the background and bring to the front"
                                               " when Ctrl+Shift+F12 (by default) is pressed")));
     // --nofork is a compatibility alias for separate
-    parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("separate") << QStringLiteral("nofork"), i18n("Run in a separate process")));
+    parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("separate") << QStringLiteral("nofork"), i18nc("@info:shell", "Run in a separate process")));
     parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("show-menubar"), i18nc("@info:shell", "Show the menubar, overriding the default setting")));
     parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("hide-menubar"), i18nc("@info:shell", "Hide the menubar, overriding the default setting")));
     parser->addOption(QCommandLineOption(QStringList() << QStringLiteral("show-tabbar"), i18nc("@info:shell", "Show the tabbar, overriding the default setting")));
diff --git a/src/ColorSchemeEditor.cpp b/src/ColorSchemeEditor.cpp
index 59a32d22..fd01f42b 100644
--- a/src/ColorSchemeEditor.cpp
+++ b/src/ColorSchemeEditor.cpp
@@ -235,10 +235,10 @@ void ColorSchemeEditor::setup(const ColorScheme* scheme, bool isNewScheme)
     _colors = new ColorScheme(*scheme);
 
     if (_isNewScheme) {
-        setWindowTitle(i18n("New Color Scheme"));
-        setDescription(i18n("New Color Scheme"));
+        setWindowTitle(i18nc("@title:window", "New Color Scheme"));
+        setDescription(QStringLiteral("New Color Scheme"));
     } else {
-        setWindowTitle(i18n("Edit Color Scheme"));
+        setWindowTitle(i18nc("@title:window", "Edit Color Scheme"));
     }
 
     // setup description edit
diff --git a/src/IncrementalSearchBar.cpp b/src/IncrementalSearchBar.cpp
index 558ba76f..30bab5a6 100644
--- a/src/IncrementalSearchBar.cpp
+++ b/src/IncrementalSearchBar.cpp
@@ -131,9 +131,9 @@ IncrementalSearchBar::IncrementalSearchBar(QWidget* aParent)
     _highlightMatches->setToolTip(i18nc("@info:tooltip", "Sets whether matching text should be highlighted"));
     connect(_highlightMatches, &QAction::toggled, this, &Konsole::IncrementalSearchBar::highlightMatchesToggled);
 
-    _reverseSearch = optionsMenu->addAction(i18n("Search backwards"));
+    _reverseSearch = optionsMenu->addAction(i18nc("@item:inmenu", "Search backwards"));
     _reverseSearch->setCheckable(true);
-    _reverseSearch->setToolTip(i18n("Sets whether search should start from the bottom"));
+    _reverseSearch->setToolTip(i18nc("@info:tooltip", "Sets whether search should start from the bottom"));
     connect(_reverseSearch, &QAction::toggled, this, &Konsole::IncrementalSearchBar::updateButtonsAccordingToReverseSearchSetting);
     updateButtonsAccordingToReverseSearchSetting();
     setOptions();
@@ -155,12 +155,12 @@ void IncrementalSearchBar::updateButtonsAccordingToReverseSearchSetting()
     Q_ASSERT(_reverseSearch);
     if (_reverseSearch->isChecked()) {
         _searchFromButton->setText(i18nc("@action:button Search from bottom", "From bottom"));
-        _searchFromButton->setToolTip(i18n("Search for the current search phrase from the bottom"));
+        _searchFromButton->setToolTip(i18nc("@info:tooltip", "Search for the current search phrase from the bottom"));
         _findNextButton->setIcon(QIcon::fromTheme(QStringLiteral("go-up-search")));
         _findPreviousButton->setIcon(QIcon::fromTheme(QStringLiteral("go-down-search")));
     } else {
         _searchFromButton->setText(i18nc("@action:button Search from top", "From top"));
-        _searchFromButton->setToolTip(i18n("Search for the current search phrase from the top"));
+        _searchFromButton->setToolTip(i18nc("@info:tooltip", "Search for the current search phrase from the top"));
         _findNextButton->setIcon(QIcon::fromTheme(QStringLiteral("go-down-search")));
         _findPreviousButton->setIcon(QIcon::fromTheme(QStringLiteral("go-up-search")));
     }
diff --git a/src/main.cpp b/src/main.cpp
index 7813d9f3..a864a23f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -98,7 +98,7 @@ extern "C" int Q_DECL_EXPORT kdemain(int argc, char* argv[])
                      QStringLiteral(KONSOLE_VERSION),
                      i18nc("@title", "Terminal emulator"),
                      KAboutLicense::GPL_V2,
-                     i18n("(c) 1997-2017, The Konsole Developers"),
+                     i18nc("@info:credit", "(c) 1997-2017, The Konsole Developers"),
                      QStringLiteral(),
                      QStringLiteral("https://konsole.kde.org/"));
     fillAboutData(about);