diff --git a/kdevplatform/language/codegen/basicrefactoring.cpp b/kdevplatform/language/codegen/basicrefactoring.cpp
index b9af6d1e56..874fd64c41 100644
--- a/kdevplatform/language/codegen/basicrefactoring.cpp
+++ b/kdevplatform/language/codegen/basicrefactoring.cpp
@@ -1,381 +1,381 @@
 /* This file is part of KDevelop
  *
  * Copyright 2014 Miquel Sabaté <mikisabate@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Library General Public License as
  * published by the Free Software Foundation; either version 2 of the
  * License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public
  * License along with this program; if not, write to the
  * Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 // Qt
 #include <QAction>
 // KF
 #include <KParts/MainWindow>
 #include <KTextEditor/Document>
 #include <KTextEditor/View>
 // KDevelop
 #include <interfaces/icore.h>
 #include <interfaces/idocument.h>
 #include <interfaces/iuicontroller.h>
 #include <interfaces/idocumentcontroller.h>
 #include <interfaces/contextmenuextension.h>
 #include <language/duchain/duchain.h>
 #include <language/duchain/duchainlock.h>
 #include <language/duchain/duchainutils.h>
 #include <language/duchain/navigation/abstractnavigationwidget.h>
 #include <language/codegen/basicrefactoring.h>
 #include <language/interfaces/codecontext.h>
 #include <duchain/classdeclaration.h>
 #include <duchain/classfunctiondeclaration.h>
 #include <duchain/use.h>
 #include <sublime/message.h>
 
 #include "progressdialogs/refactoringdialog.h"
 #include <debug.h>
 
 #include "ui_basicrefactoring.h"
 
 namespace {
 QPair<QString, QString> splitFileAtExtension(const QString& fileName)
 {
     int idx = fileName.indexOf(QLatin1Char('.'));
     if (idx == -1) {
         return qMakePair(fileName, QString());
     }
     return qMakePair(fileName.left(idx), fileName.mid(idx));
 }
 }
 
 using namespace KDevelop;
 
 //BEGIN: BasicRefactoringCollector
 
 BasicRefactoringCollector::BasicRefactoringCollector(const IndexedDeclaration& decl)
     : UsesWidgetCollector(decl)
 {
     setCollectConstructors(true);
     setCollectDefinitions(true);
     setCollectOverloads(true);
 }
 
 QVector<IndexedTopDUContext> BasicRefactoringCollector::allUsingContexts() const
 {
     return m_allUsingContexts;
 }
 
 void BasicRefactoringCollector::processUses(KDevelop::ReferencedTopDUContext topContext)
 {
     m_allUsingContexts << IndexedTopDUContext(topContext.data());
     UsesWidgetCollector::processUses(topContext);
 }
 
 //END: BasicRefactoringCollector
 
 //BEGIN: BasicRefactoring
 
 BasicRefactoring::BasicRefactoring(QObject* parent)
     : QObject(parent)
 {
     /* There's nothing to do here. */
 }
 
 void BasicRefactoring::fillContextMenu(ContextMenuExtension& extension, Context* context, QWidget* parent)
 {
     auto* declContext = dynamic_cast<DeclarationContext*>(context);
     if (!declContext)
         return;
 
     DUChainReadLocker lock;
     Declaration* declaration = declContext->declaration().data();
     if (declaration && acceptForContextMenu(declaration)) {
         QFileInfo finfo(declaration->topContext()->url().str());
         if (finfo.isWritable()) {
-            auto* action = new QAction(i18n("Rename \"%1\"...",
+            auto* action = new QAction(i18nc("@action", "Rename \"%1\"...",
                                             declaration->qualifiedIdentifier().toString()), parent);
             action->setData(QVariant::fromValue(IndexedDeclaration(declaration)));
             action->setIcon(QIcon::fromTheme(QStringLiteral("edit-rename")));
             connect(action, &QAction::triggered, this, &BasicRefactoring::executeRenameAction);
             extension.addAction(ContextMenuExtension::RefactorGroup, action);
         }
     }
 }
 
 bool BasicRefactoring::shouldRenameUses(KDevelop::Declaration* declaration) const
 {
     // Now we know we're editing a declaration, but some declarations we don't offer a rename for
     // basically that's any declaration that wouldn't be fully renamed just by renaming its uses().
     if (declaration->internalContext() || declaration->isForwardDeclaration()) {
         //make an exception for non-class functions
         if (!declaration->isFunctionDeclaration() || dynamic_cast<ClassFunctionDeclaration*>(declaration))
             return false;
     }
     return true;
 }
 
 QString BasicRefactoring::newFileName(const QUrl& current, const QString& newName)
 {
     QPair<QString, QString> nameExtensionPair = splitFileAtExtension(current.fileName());
     // if current file is lowercased, keep that
     if (nameExtensionPair.first == nameExtensionPair.first.toLower()) {
         return newName.toLower() + nameExtensionPair.second;
     } else {
         return newName + nameExtensionPair.second;
     }
 }
 
 DocumentChangeSet::ChangeResult BasicRefactoring::addRenameFileChanges(const QUrl& current,
                                                                        const QString& newName,
                                                                        DocumentChangeSet* changes)
 {
     return changes->addDocumentRenameChange(
         IndexedString(current), IndexedString(newFileName(current, newName)));
 }
 
 bool BasicRefactoring::shouldRenameFile(Declaration* declaration)
 {
     // only try to rename files when we renamed a class/struct
     if (!dynamic_cast<ClassDeclaration*>(declaration)) {
         return false;
     }
     const QUrl currUrl = declaration->topContext()->url().toUrl();
     const QString fileName = currUrl.fileName();
     const QPair<QString, QString> nameExtensionPair = splitFileAtExtension(fileName);
     // check whether we renamed something that is called like the document it lives in
     return nameExtensionPair.first.compare(declaration->identifier().toString(), Qt::CaseInsensitive) == 0;
 }
 
 DocumentChangeSet::ChangeResult BasicRefactoring::applyChanges(const QString& oldName, const QString& newName,
                                                                DocumentChangeSet& changes, DUContext* context,
                                                                int usedDeclarationIndex)
 {
     if (usedDeclarationIndex == std::numeric_limits<int>::max())
         return DocumentChangeSet::ChangeResult::successfulResult();
 
     for (int a = 0; a < context->usesCount(); ++a) {
         const Use& use(context->uses()[a]);
         if (use.m_declarationIndex != usedDeclarationIndex)
             continue;
         if (use.m_range.isEmpty()) {
             qCDebug(LANGUAGE) << "found empty use";
             continue;
         }
         DocumentChangeSet::ChangeResult result =
             changes.addChange(DocumentChange(context->url(), context->transformFromLocalRevision(use.m_range), oldName,
                                              newName));
         if (!result)
             return result;
     }
 
     const auto childContexts = context->childContexts();
     for (DUContext* child : childContexts) {
         DocumentChangeSet::ChangeResult result = applyChanges(oldName, newName, changes, child, usedDeclarationIndex);
         if (!result)
             return result;
     }
 
     return DocumentChangeSet::ChangeResult::successfulResult();
 }
 
 DocumentChangeSet::ChangeResult BasicRefactoring::applyChangesToDeclarations(const QString& oldName,
                                                                              const QString& newName,
                                                                              DocumentChangeSet& changes,
                                                                              const QList<IndexedDeclaration>& declarations)
 {
     for (auto& decl : declarations) {
         Declaration* declaration = decl.data();
         if (!declaration)
             continue;
         if (declaration->range().isEmpty())
             qCDebug(LANGUAGE) << "found empty declaration";
 
         TopDUContext* top = declaration->topContext();
         DocumentChangeSet::ChangeResult result =
             changes.addChange(DocumentChange(top->url(), declaration->rangeInCurrentRevision(), oldName, newName));
         if (!result)
             return result;
     }
 
     return DocumentChangeSet::ChangeResult::successfulResult();
 }
 
 KDevelop::IndexedDeclaration BasicRefactoring::declarationUnderCursor(bool allowUse)
 {
     KTextEditor::View* view = ICore::self()->documentController()->activeTextDocumentView();
     if (!view)
         return KDevelop::IndexedDeclaration();
     KTextEditor::Document* doc = view->document();
 
     DUChainReadLocker lock;
     if (allowUse)
         return DUChainUtils::itemUnderCursor(doc->url(), KTextEditor::Cursor(view->cursorPosition())).declaration;
     else
         return DUChainUtils::declarationInLine(KTextEditor::Cursor(
                                                    view->cursorPosition()),
                                                DUChainUtils::standardContextForUrl(doc->url()));
 }
 
 void BasicRefactoring::startInteractiveRename(const KDevelop::IndexedDeclaration& decl)
 {
     DUChainReadLocker lock(DUChain::lock());
 
     Declaration* declaration = decl.data();
     if (!declaration) {
         auto* message = new Sublime::Message(i18n("No declaration under cursor"), Sublime::Message::Error);
         ICore::self()->uiController()->postMessage(message);
         return;
     }
     QFileInfo info(declaration->topContext()->url().str());
     if (!info.isWritable()) {
         const QString messageText = i18n("Declaration is located in non-writable file %1.",
                                 declaration->topContext()->url().str());
         auto* message = new Sublime::Message(messageText, Sublime::Message::Error);
         ICore::self()->uiController()->postMessage(message);
         return;
     }
 
     QString originalName = declaration->identifier().identifier().str();
     lock.unlock();
 
     NameAndCollector nc = newNameForDeclaration(DeclarationPointer(declaration));
 
     if (nc.newName == originalName || nc.newName.isEmpty())
         return;
 
     renameCollectedDeclarations(nc.collector.data(), nc.newName, originalName);
 }
 
 bool BasicRefactoring::acceptForContextMenu(const Declaration* decl)
 {
     // Default implementation. Some language plugins might override it to
     // handle some cases.
     Q_UNUSED(decl);
     return true;
 }
 
 void BasicRefactoring::executeRenameAction()
 {
     auto* action = qobject_cast<QAction*>(sender());
     if (action) {
         IndexedDeclaration decl = action->data().value<IndexedDeclaration>();
         if (!decl.isValid())
             decl = declarationUnderCursor();
 
         if (!decl.isValid())
             return;
 
         startInteractiveRename(decl);
     }
 }
 
 BasicRefactoring::NameAndCollector BasicRefactoring::newNameForDeclaration(
     const KDevelop::DeclarationPointer& declaration)
 {
     DUChainReadLocker lock;
     if (!declaration) {
         return {};
     }
 
     QSharedPointer<BasicRefactoringCollector> collector(new BasicRefactoringCollector(declaration.data()));
 
     Ui::RenameDialog renameDialog;
     QDialog dialog;
     renameDialog.setupUi(&dialog);
 
     UsesWidget uses(declaration.data(), collector);
 
     //So the context-links work
     auto* navigationWidget = declaration->context()->createNavigationWidget(declaration.data());
     if (navigationWidget)
         connect(&uses, &UsesWidget::navigateDeclaration, navigationWidget,
                 &AbstractNavigationWidget::navigateDeclaration);
 
     QString declarationName = declaration->toString();
-    dialog.setWindowTitle(i18nc("Renaming some declaration", "Rename \"%1\"", declarationName));
+    dialog.setWindowTitle(i18nc("@title:window Renaming some declaration", "Rename \"%1\"", declarationName));
     renameDialog.edit->setText(declaration->identifier().identifier().str());
     renameDialog.edit->selectAll();
 
-    renameDialog.tabWidget->addTab(&uses, i18n("Uses"));
+    renameDialog.tabWidget->addTab(&uses, i18nc("@title:tab", "Uses"));
     if (navigationWidget)
-        renameDialog.tabWidget->addTab(navigationWidget, i18n("Declaration Info"));
+        renameDialog.tabWidget->addTab(navigationWidget, i18nc("@title:tab", "Declaration Info"));
     lock.unlock();
 
     if (dialog.exec() != QDialog::Accepted)
         return {};
 
     const auto text = renameDialog.edit->text().trimmed();
     RefactoringProgressDialog refactoringProgress(i18n("Renaming \"%1\" to \"%2\"", declarationName,
                                                        text), collector.data());
     if (!collector->isReady()) {
         if (refactoringProgress.exec() != QDialog::Accepted) { // krazy:exclude=crashy
             return {};
         }
     }
 
     //TODO: input validation
     return {
                text, collector
     };
 }
 
 DocumentChangeSet BasicRefactoring::renameCollectedDeclarations(KDevelop::BasicRefactoringCollector* collector,
                                                                 const QString& replacementName,
                                                                 const QString& originalName, bool apply)
 {
     DocumentChangeSet changes;
     DUChainReadLocker lock;
 
     const auto allUsingContexts = collector->allUsingContexts();
     for (const KDevelop::IndexedTopDUContext collected : allUsingContexts) {
         QSet<int> hadIndices;
         const auto declarations = collector->declarations();
         for (const IndexedDeclaration decl : declarations) {
             uint usedDeclarationIndex = collected.data()->indexForUsedDeclaration(decl.data(), false);
             if (hadIndices.contains(usedDeclarationIndex))
                 continue;
             hadIndices.insert(usedDeclarationIndex);
             DocumentChangeSet::ChangeResult result = applyChanges(originalName, replacementName, changes,
                                                                   collected.data(), usedDeclarationIndex);
             if (!result) {
                 auto* message = new Sublime::Message(i18n("Failed to apply changes: %1", result.m_failureReason), Sublime::Message::Error);
                 ICore::self()->uiController()->postMessage(message);
                 return {};
             }
         }
     }
 
     DocumentChangeSet::ChangeResult result = applyChangesToDeclarations(originalName, replacementName, changes,
                                                                         collector->declarations());
     if (!result) {
         auto* message = new Sublime::Message(i18n("Failed to apply changes: %1", result.m_failureReason), Sublime::Message::Error);
         ICore::self()->uiController()->postMessage(message);
         return {};
     }
 
     ///We have to ignore failed changes for now, since uses of a constructor or of operator() may be created on "(" parens
     changes.setReplacementPolicy(DocumentChangeSet::IgnoreFailedChange);
 
     if (!apply) {
         return changes;
     }
 
     result = changes.applyAllChanges();
     if (!result) {
         auto* message = new Sublime::Message(i18n("Failed to apply changes: %1", result.m_failureReason), Sublime::Message::Error);
         ICore::self()->uiController()->postMessage(message);
     }
 
     return {};
 }
 
 //END: BasicRefactoring
diff --git a/kdevplatform/language/codegen/basicrefactoring.ui b/kdevplatform/language/codegen/basicrefactoring.ui
index e353d1e8d5..201912e350 100644
--- a/kdevplatform/language/codegen/basicrefactoring.ui
+++ b/kdevplatform/language/codegen/basicrefactoring.ui
@@ -1,95 +1,95 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>RenameDialog</class>
  <widget class="QDialog" name="RenameDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>750</width>
     <height>550</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Rename</string>
+   <string comment="@title:window">Rename</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="newNameLabel">
        <property name="text">
-        <string>&amp;New name:</string>
+        <string comment="@label:textbox">&amp;New name:</string>
        </property>
        <property name="buddy">
         <cstring>edit</cstring>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QLineEdit" name="edit"/>
      </item>
      <item>
       <widget class="QPushButton" name="goButton">
        <property name="toolTip">
         <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&amp;quot;Note: All overloaded functions, overloads, forward-declarations, etc. will be renamed too&amp;quot;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
        <property name="text">
-        <string>&amp;Rename</string>
+        <string comment="@action:button">&amp;Rename</string>
        </property>
       </widget>
      </item>
      <item>
       <widget class="QPushButton" name="cancelButton">
        <property name="text">
-        <string>&amp;Cancel</string>
+        <string comment="@action:button">&amp;Cancel</string>
        </property>
       </widget>
      </item>
     </layout>
    </item>
    <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="currentIndex">
       <number>-1</number>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections>
   <connection>
    <sender>cancelButton</sender>
    <signal>clicked()</signal>
    <receiver>RenameDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>702</x>
      <y>22</y>
     </hint>
     <hint type="destinationlabel">
      <x>374</x>
      <y>274</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>goButton</sender>
    <signal>clicked()</signal>
    <receiver>RenameDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>617</x>
      <y>22</y>
     </hint>
     <hint type="destinationlabel">
      <x>374</x>
      <y>274</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>
diff --git a/kdevplatform/language/codegen/progressdialogs/refactoringdialog.ui b/kdevplatform/language/codegen/progressdialogs/refactoringdialog.ui
index 59a20bef23..08ec3f4ef3 100644
--- a/kdevplatform/language/codegen/progressdialogs/refactoringdialog.ui
+++ b/kdevplatform/language/codegen/progressdialogs/refactoringdialog.ui
@@ -1,66 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
  <class>RefactoringDialog</class>
  <widget class="QDialog" name="RefactoringDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
     <width>536</width>
     <height>99</height>
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Refactoring</string>
+   <string comment="@title:window">Refactoring</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="2" column="0">
     <widget class="QProgressBar" name="progressBar">
      <property name="value">
       <number>5</number>
      </property>
     </widget>
    </item>
    <item row="2" column="1">
     <widget class="QPushButton" name="abortButton">
      <property name="text">
-      <string>&amp;Abort</string>
+      <string comment="@action:button">&amp;Abort</string>
      </property>
     </widget>
    </item>
    <item row="1" column="0" colspan="2">
     <widget class="QLabel" name="fileLabel">
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
    <item row="0" column="0" colspan="2">
     <widget class="QLabel" name="renameLabel">
      <property name="text">
       <string/>
      </property>
     </widget>
    </item>
   </layout>
  </widget>
  <resources/>
  <connections>
   <connection>
    <sender>abortButton</sender>
    <signal>clicked()</signal>
    <receiver>RefactoringDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
      <x>489</x>
      <y>77</y>
     </hint>
     <hint type="destinationlabel">
      <x>267</x>
      <y>49</y>
     </hint>
    </hints>
   </connection>
  </connections>
 </ui>