FakeVim: Tr::tr

Change-Id: Idca64705f2058d22480da6a624008971c8d8aab4
Reviewed-by: hjk <hjk@qt.io>

15 files changed, 59 insertions, 627 deletions

diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts
index 5228208433..5905b0a89f 100644
--- a/share/qtcreator/translations/qtcreator_cs.ts
+++ b/share/qtcreator/translations/qtcreator_cs.ts
@@ -4894,7 +4894,7 @@ Důvod: %3</translation>
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal</name>
+    <name>::FakeVim</name>
     <message>
         <source>Toggle vim-style editing</source>
         <translation type="obsolete">Přepnout úpravy do režimu vim</translation>
@@ -4915,9 +4915,6 @@ Důvod: %3</translation>
         <source>Path to .vimrc</source>
         <translation>Cesta k .vimrc</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimHandler</name>
     <message>
         <source>Not implemented in FakeVim</source>
         <translation type="obsolete">Neprovedeno v FakeVim</translation>
@@ -5140,9 +5137,6 @@ Důvod: %3</translation>
         <source>Argument must be positive: %1=%2</source>
         <translation>Argument musí být kladný: %1=%2</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimOptionPage</name>
     <message>
         <source>General</source>
         <translation>Obecné</translation>
@@ -5160,10 +5154,6 @@ Důvod: %3</translation>
         <translation>Používat FakeVim</translation>
     </message>
     <message>
-        <source>Read .vimrc</source>
-        <translation type="obsolete">Číst .vimrc</translation>
-    </message>
-    <message>
         <source>Vim Behavior</source>
         <translation>Chování Vim</translation>
     </message>
@@ -5220,10 +5210,6 @@ Důvod: %3</translation>
         <translation>Nastavení tabulátorů Vim</translation>
     </message>
     <message>
-        <source>Tabulator size:</source>
-        <translation>Šířka tabulátoru:</translation>
-    </message>
-    <message>
         <source>Backspace:</source>
         <translation>Zpětná klávesa:</translation>
     </message>
@@ -5304,9 +5290,6 @@ Důvod: %3</translation>
         <source>Vim tabstop option.</source>
         <translation>Nastavení tabulátorů Vim.</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimPluginPrivate</name>
     <message>
         <source>Switch to next file</source>
         <translation type="obsolete">Přejít k dalšímu souboru</translation>
@@ -5356,20 +5339,9 @@ Důvod: %3</translation>
         </translation>
     </message>
     <message>
-        <source>Not an editor command: %1</source>
-        <translation type="obsolete">Není příkazem editoru: %1</translation>
-    </message>
-    <message>
         <source>FakeVim Information</source>
         <translation>Informace k FakeVim</translation>
     </message>
-</context>
-<context>
-    <name>FakeVimOptionPage</name>
-    <message>
-        <source>Use FakeVim</source>
-        <translation type="obsolete">Používat FakeVim</translation>
-    </message>
     <message>
         <source>Vim style settings</source>
         <translation type="obsolete">Nastavení pro styl Vim</translation>
@@ -5387,10 +5359,6 @@ Důvod: %3</translation>
         <translation type="obsolete">Zvýraznit výsledky hledání:</translation>
     </message>
     <message>
-        <source>Shift width:</source>
-        <translation type="obsolete">Odsazení:</translation>
-    </message>
-    <message>
         <source>Smart tabulators:</source>
         <translation type="obsolete">Režim chytrých zarážek:</translation>
     </message>
@@ -5404,11 +5372,7 @@ Důvod: %3</translation>
     </message>
     <message>
         <source>Tabulator size:</source>
-        <translation type="obsolete">Šířka zarážky:</translation>
-    </message>
-    <message>
-        <source>Backspace:</source>
-        <translation type="obsolete">Zpětná klávesa:</translation>
+        <translation>Šířka zarážky:</translation>
     </message>
     <message>
         <source>VIM&apos;s &quot;autoindent&quot; option</source>
@@ -5434,78 +5398,6 @@ Důvod: %3</translation>
         <source>Incremental search:</source>
         <translation type="obsolete">Přírůstkové hledání:</translation>
     </message>
-    <message>
-        <source>Read .vimrc</source>
-        <translation type="obsolete">Číst .vimrc</translation>
-    </message>
-    <message>
-        <source>Vim Behavior</source>
-        <translation type="obsolete">Chování Vim</translation>
-    </message>
-    <message>
-        <source>Automatic indentation</source>
-        <translation type="obsolete">Automatické odsazení</translation>
-    </message>
-    <message>
-        <source>Start of line</source>
-        <translation type="obsolete">Začátek řádku</translation>
-    </message>
-    <message>
-        <source>Smart indentation</source>
-        <translation type="obsolete">Chytré odsazování</translation>
-    </message>
-    <message>
-        <source>Use search dialog</source>
-        <translation type="obsolete">Použít dialog pro hledání</translation>
-    </message>
-    <message>
-        <source>Expand tabulators</source>
-        <translation type="obsolete">Rozbalit zarážky</translation>
-    </message>
-    <message>
-        <source>Show position of text marks</source>
-        <translation type="obsolete">Ukázat polohu textových značek</translation>
-    </message>
-    <message>
-        <source>Smart tabulators</source>
-        <translation type="obsolete">Režim chytrých zarážek</translation>
-    </message>
-    <message>
-        <source>Highlight search results</source>
-        <translation type="obsolete">Zvýraznit výsledky hledání</translation>
-    </message>
-    <message>
-        <source>Incremental search</source>
-        <translation type="obsolete">Přírůstkové hledání</translation>
-    </message>
-    <message>
-        <source>Keyword characters:</source>
-        <translation type="obsolete">Znaky klíčového slova:</translation>
-    </message>
-    <message>
-        <source>Copy Text Editor Settings</source>
-        <translation type="obsolete">Kopírovat nastavení textového editoru</translation>
-    </message>
-    <message>
-        <source>Set Qt Style</source>
-        <translation type="obsolete">Nastavit styl Qt</translation>
-    </message>
-    <message>
-        <source>Set Plain Style</source>
-        <translation type="obsolete">Nastavit prostý styl</translation>
-    </message>
-    <message>
-        <source>Pass key sequences like Ctrl-S to Qt Creator core instead of interpreting them in FakeVim. This gives easier access to Qt Creator core functionality at the price of losing some features of FakeVim.</source>
-        <translation type="obsolete">Způsobí, že s určitými klávesovými zkratkami jako je Ctrl-S se nezachází v FakeVim, nýbrž jsou postoupeny Qt Creatoru. Toto usnadňuje přístup k základním funkcím Qt Creatoru za cenu ztráty některých funkcí FakeVimu.</translation>
-    </message>
-    <message>
-        <source>Pass control key</source>
-        <translation type="obsolete">Postoupit klávesu Ctrl</translation>
-    </message>
-    <message>
-        <source>Vim tabstop option</source>
-        <translation type="obsolete">Nastavení zarážek Vim</translation>
-    </message>
 </context>
 <context>
     <name>FilterNameDialogClass</name>
@@ -22697,7 +22589,7 @@ Proces Pdb po určité době od úspěšného spuštění spadl.</translation>
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal::FakeVimHandler::Private</name>
+    <name>::FakeVim</name>
     <message>
         <source>Recursive mapping</source>
         <translation>Rekurzivní přiřazení</translation>
@@ -22714,18 +22606,11 @@ Proces Pdb po určité době od úspěšného spuštění spadl.</translation>
         <source>Not an editor command: %1</source>
         <translation>Není příkazem editoru: %1</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimExCommandsPage</name>
     <message>
         <source>Ex Command Mapping</source>
         <translation>Přiřazení příkazů pro Ex</translation>
     </message>
     <message>
-        <source>FakeVim</source>
-        <translation>FakeVim</translation>
-    </message>
-    <message>
         <source>Ex Trigger Expression</source>
         <translation>Příkaz</translation>
     </message>
@@ -32026,7 +31911,7 @@ Má se to zkusit ještě jednou?</translation>
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal::FakeVimUserCommandsModel</name>
+    <name>::FakeVim</name>
     <message>
         <source>Action</source>
         <translation>Úkon</translation>
@@ -32039,17 +31924,10 @@ Má se to zkusit ještě jednou?</translation>
         <source>User command #%1</source>
         <translation>Uživatelský příkaz #%1</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimUserCommandsPage</name>
     <message>
         <source>User Command Mapping</source>
         <translation>Přiřazení příkazů</translation>
     </message>
-    <message>
-        <source>FakeVim</source>
-        <translation>FakeVim</translation>
-    </message>
 </context>
 <context>
     <name>::GenericProjectManager</name>
diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts
index beb39af15f..ee41ac7ef5 100644
--- a/share/qtcreator/translations/qtcreator_da.ts
+++ b/share/qtcreator/translations/qtcreator_da.ts
@@ -14871,9 +14871,6 @@ vil også deaktiverer følgende plugins:
             <numerusform>%n filer ikke gemt</numerusform>
         </translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimOptionPage</name>
     <message>
         <source>Use FakeVim</source>
         <translation>Brug FakeVim</translation>
diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts
index 7c6075cdab..058f7e4da1 100644
--- a/share/qtcreator/translations/qtcreator_es.ts
+++ b/share/qtcreator/translations/qtcreator_es.ts
@@ -4482,7 +4482,7 @@ Razón: %3</translation>
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal</name>
+    <name>::FakeVim</name>
     <message>
         <source>Toggle vim-style editing</source>
         <translation>Activar/desactivar edición al estilo Vim</translation>
@@ -4491,9 +4491,6 @@ Razón: %3</translation>
         <source>FakeVim properties...</source>
         <translation>Ajustes de FakeVim...</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimHandler</name>
     <message>
         <source>Not implemented in FakeVim</source>
         <translation>No implementado en FakeVim</translation>
@@ -4577,9 +4574,6 @@ Razón: %3</translation>
         <source>Already at newest change</source>
         <translation>Ya está en el cambio mas reciente</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimOptionPage</name>
     <message>
         <source>General</source>
         <translation></translation>
@@ -4588,9 +4582,6 @@ Razón: %3</translation>
         <source>FakeVim</source>
         <translation></translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimPluginPrivate</name>
     <message>
         <source>Quit FakeVim</source>
         <translation>Salir de FakeVim</translation>
@@ -4614,9 +4605,6 @@ Razón: %3</translation>
         <source>FakeVim Information</source>
         <translation>Información sobre FakeVim</translation>
     </message>
-</context>
-<context>
-    <name>FakeVimOptionPage</name>
     <message>
         <source>Use FakeVim</source>
         <translation>Usar FakeVim</translation>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index 8f95477b3c..e502dce061 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -5665,7 +5665,7 @@ Raison : %3</translation>
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal</name>
+    <name>::FakeVim</name>
     <message>
         <source>Toggle vim-style editing</source>
         <translation type="obsolete">Activer/désactiver l&apos;édition en mode vim</translation>
@@ -5686,9 +5686,6 @@ Raison : %3</translation>
         <source>Path to .vimrc</source>
         <translation>Chemin vers .vimrc</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimHandler</name>
     <message>
         <source>Not implemented in FakeVim</source>
         <translation type="obsolete">Pas implémenté dans FakeVim</translation>
@@ -5894,9 +5891,6 @@ Raison : %3</translation>
         <source>Argument must be positive: %1=%2</source>
         <translation>L&apos;argument doit être positif : %1 = %2</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimOptionPage</name>
     <message>
         <source>General</source>
         <translation>Général</translation>
@@ -5914,10 +5908,6 @@ Raison : %3</translation>
         <translation>Utiliser FakeVim</translation>
     </message>
     <message>
-        <source>Read .vimrc</source>
-        <translation type="obsolete">prendre en compte .vimrc</translation>
-    </message>
-    <message>
         <source>Vim Behavior</source>
         <translation>Comportement Vim</translation>
     </message>
@@ -6037,9 +6027,6 @@ Raison : %3</translation>
         <source>Browse...</source>
         <translation>Parcourir...</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimPluginPrivate</name>
     <message>
         <source>Switch to next file</source>
         <translation type="obsolete">Passer au fichier suivant</translation>
@@ -6088,20 +6075,9 @@ Raison : %3</translation>
         </translation>
     </message>
     <message>
-        <source>Not an editor command: %1</source>
-        <translation type="obsolete">Pas une commande de l&apos;éditeur : %1</translation>
-    </message>
-    <message>
         <source>FakeVim Information</source>
         <translation>Information sur FakeVim</translation>
     </message>
-</context>
-<context>
-    <name>FakeVimOptionPage</name>
-    <message>
-        <source>Use FakeVim</source>
-        <translation type="obsolete">Utiliser FakeVim</translation>
-    </message>
     <message>
         <source>Vim style settings</source>
         <translation type="obsolete">Paramètres de l&apos;édition de type vim</translation>
@@ -6119,10 +6095,6 @@ Raison : %3</translation>
         <translation type="obsolete">Surligner les résultats de recherche :</translation>
     </message>
     <message>
-        <source>Shift width:</source>
-        <translation type="obsolete">Largeur d&apos;indentation :</translation>
-    </message>
-    <message>
         <source>Smart tabulators:</source>
         <translation type="obsolete">Tabulation intelligente :</translation>
     </message>
@@ -6135,14 +6107,6 @@ Raison : %3</translation>
         <translation type="obsolete">option &quot;tabstop&quot; de vim</translation>
     </message>
     <message>
-        <source>Tabulator size:</source>
-        <translation type="obsolete">Taille des tabulations :</translation>
-    </message>
-    <message>
-        <source>Backspace:</source>
-        <translation type="obsolete">Touche retour :</translation>
-    </message>
-    <message>
         <source>VIM&apos;s &quot;autoindent&quot; option</source>
         <translation type="obsolete">option &quot;autoindent&quot; de vim</translation>
     </message>
@@ -6167,84 +6131,9 @@ Raison : %3</translation>
         <translation type="obsolete">Définir le style plein</translation>
     </message>
     <message>
-        <source>Read .vimrc</source>
-        <translatorcomment>J&apos;aurais proposer &quot;lire les .vimrc&quot; non ?
-pierre: ouaip, je trouvais ça plus clair avec &quot;prendre en compte&quot; puisque pour le coup c&apos;est des préférences
-Francis : en effet, je n&apos;avais pas pris en compte le contexte.</translatorcomment>
-        <translation type="obsolete">prendre en compte .vimrc</translation>
-    </message>
-    <message>
-        <source>Vim Behavior</source>
-        <translation type="obsolete">Comportement Vim</translation>
-    </message>
-    <message>
-        <source>Automatic indentation</source>
-        <translation type="obsolete">Indentation automatique</translation>
-    </message>
-    <message>
-        <source>Start of line</source>
-        <translation type="obsolete">Début de ligne</translation>
-    </message>
-    <message>
-        <source>Smart indentation</source>
-        <translation type="obsolete">Indentation intelligente</translation>
-    </message>
-    <message>
-        <source>Use search dialog</source>
-        <translation type="obsolete">Utiliser la fenêtre de recherche</translation>
-    </message>
-    <message>
-        <source>Expand tabulators</source>
-        <translation type="obsolete">Étendre les tabulations</translation>
-    </message>
-    <message>
-        <source>Show position of text marks</source>
-        <translation type="obsolete">Afficher la position des marques textuelles</translation>
-    </message>
-    <message>
-        <source>Smart tabulators</source>
-        <translation type="obsolete">Tabulation intelligente</translation>
-    </message>
-    <message>
-        <source>Highlight search results</source>
-        <translation type="obsolete">Surligner les résultats de recherche</translation>
-    </message>
-    <message>
-        <source>Incremental search</source>
-        <translation type="obsolete">Recherche incrémentale</translation>
-    </message>
-    <message>
-        <source>Keyword characters:</source>
-        <translation type="obsolete">Caractères mot-clés :</translation>
-    </message>
-    <message>
-        <source>Copy Text Editor Settings</source>
-        <translation type="obsolete">Copier les paramètres de l&apos;éditeur de texte</translation>
-    </message>
-    <message>
-        <source>Set Qt Style</source>
-        <translation type="obsolete">Utiliser le style Qt</translation>
-    </message>
-    <message>
-        <source>Set Plain Style</source>
-        <translation type="obsolete">Utiliser le style simple</translation>
-    </message>
-    <message>
         <source>Checking this box passes key sequences like Ctrl-S to the Creator core instead of interpreting them in FakeVim. This gives easier access to Creator core functionality at the price of losing some features of FakeVim.</source>
         <translation type="obsolete">Cocher cette case passe des séquences comme Ctrl+S au coeur de Creator au lieu de les interpréter dans FakeVim. Ceci donne un accès plus facile aux fonctionnalités du coeur de Creator, au prix de la perte de quelques fonctionnalités de FakeVim. </translation>
     </message>
-    <message>
-        <source>Pass control key</source>
-        <translation type="obsolete">Passer la clé de contrôle</translation>
-    </message>
-    <message>
-        <source>Vim tabstop option</source>
-        <translation type="obsolete">Option tabstop de Vim</translation>
-    </message>
-    <message>
-        <source>Pass key sequences like Ctrl-S to Qt Creator core instead of interpreting them in FakeVim. This gives easier access to Qt Creator core functionality at the price of losing some features of FakeVim.</source>
-        <translation type="obsolete">Passer les séquences de touches comme Ctrl-S à Qt Creator au lieu de les interpréter dans FakeVim. Ceci donne un accès plus facile aux fonctionnalités de base de Qt Creator au prix de la perte de certaines fonctionnalités de FakeVim. </translation>
-    </message>
 </context>
 <context>
     <name>FilterNameDialogClass</name>
@@ -21786,7 +21675,7 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus.</translation>
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal::FakeVimHandler::Private</name>
+    <name>::FakeVim</name>
     <message>
         <source>Recursive mapping</source>
         <translation>Construction de correspondance récursif</translation>
@@ -21803,18 +21692,11 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus.</translation>
         <source>Not an editor command: %1</source>
         <translation>Pas une commande de l&apos;éditeur : %1</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimExCommandsPage</name>
     <message>
         <source>Ex Command Mapping</source>
         <translation>Mappage des commandes Ex</translation>
     </message>
     <message>
-        <source>FakeVim</source>
-        <translation>FakeVim</translation>
-    </message>
-    <message>
         <source>Ex Trigger Expression</source>
         <translation>Expression d&apos;activation Ex</translation>
     </message>
@@ -34278,7 +34160,7 @@ Would you like to overwrite them?</source>
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal::FakeVimUserCommandsModel</name>
+    <name>::FakeVim</name>
     <message>
         <source>Action</source>
         <translation>Action</translation>
@@ -34291,17 +34173,10 @@ Would you like to overwrite them?</source>
         <source>User command #%1</source>
         <translation>Commande utilisateur #%1</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimUserCommandsPage</name>
     <message>
         <source>User Command Mapping</source>
         <translation>Correspondance des commandes utilisateur</translation>
     </message>
-    <message>
-        <source>FakeVim</source>
-        <translation>FakeVim</translation>
-    </message>
 </context>
 <context>
     <name>::GenericProjectManager</name>
diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts
index 85f20ac0da..feca10cf07 100644
--- a/share/qtcreator/translations/qtcreator_hr.ts
+++ b/share/qtcreator/translations/qtcreator_hr.ts
@@ -3463,7 +3463,7 @@ Ti se predznaci koriste kao dodatak trenutačnom direktoriju na Switch zaglavlju
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal::FakeVimOptionPage</name>
+    <name>::FakeVim</name>
     <message>
         <source>Use FakeVim</source>
         <translation>Koristi FakeVim</translation>
diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts
index 68e0545a09..d3f5493406 100644
--- a/share/qtcreator/translations/qtcreator_hu.ts
+++ b/share/qtcreator/translations/qtcreator_hu.ts
@@ -5980,7 +5980,7 @@ Ok: %3</translation>
     </message>
 </context>
 <context>
-    <name>FakeVim::0</name>
+    <name>::FakeVim</name>
     <message>
         <source>Toggle vim-style editing</source>
         <translation type="obsolete">Vim stílusú szerkesztés kapcsolgatása</translation>
@@ -5989,9 +5989,6 @@ Ok: %3</translation>
         <source>FakeVim properties...</source>
         <translation type="obsolete">Vim utánzat beállítások...</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal</name>
     <message>
         <source>Toggle vim-style editing</source>
         <translation>Vim stílusú szerkesztés kapcsolgatása</translation>
@@ -6000,9 +5997,6 @@ Ok: %3</translation>
         <source>FakeVim properties...</source>
         <translation>Vim utánzat beállítások...</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::0</name>
     <message>
         <source>%1,%2</source>
         <translation type="obsolete">%1,%2</translation>
@@ -6091,9 +6085,6 @@ Ok: %3</translation>
         <source>FakeVim Information</source>
         <translation type="obsolete">Vim utánzat információ</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimHandler</name>
     <message>
         <source>E20: Mark &apos;%1&apos; not set</source>
         <translation>E20: %1&apos;-es megjelölés nincsen beállítva</translation>
@@ -6164,9 +6155,6 @@ Ok: %3</translation>
         <source>Already at newest change</source>
         <translation>Ez már a legújabb változat</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimOptionPage</name>
     <message>
         <source>General</source>
         <translation>Általános</translation>
@@ -6175,9 +6163,6 @@ Ok: %3</translation>
         <source>FakeVim</source>
         <translation>Vim utánzat</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimPluginPrivate</name>
     <message>
         <source>Quit FakeVim</source>
         <translation>Kilépés a Vim utánzatból</translation>
@@ -6199,9 +6184,6 @@ Ok: %3</translation>
         <source>FakeVim Information</source>
         <translation>Vim utánzat információ</translation>
     </message>
-</context>
-<context>
-    <name>FakeVimOptionPage</name>
     <message>
         <source>Use FakeVim</source>
         <translation>Vim utánzat használata</translation>
diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts
index b46d75d19d..403b578928 100644
--- a/share/qtcreator/translations/qtcreator_it.ts
+++ b/share/qtcreator/translations/qtcreator_it.ts
@@ -4375,7 +4375,7 @@ Causa: %3</translation>
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal</name>
+    <name>::FakeVim</name>
     <message>
         <source>Toggle vim-style editing</source>
         <translation>Commuta l&apos;editor vim-style</translation>
@@ -4384,9 +4384,6 @@ Causa: %3</translation>
         <source>FakeVim properties...</source>
         <translation>Proprietà di FakeVim...</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimHandler</name>
     <message>
         <source>%1,%2</source>
         <translation type="obsolete">%1,%2</translation>
@@ -4477,9 +4474,6 @@ Causa: %3</translation>
         <source>Already at newest change</source>
         <translation>Già alla modifica più recente</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimOptionPage</name>
     <message>
         <source>General</source>
         <translation>Generale</translation>
@@ -4488,9 +4482,6 @@ Causa: %3</translation>
         <source>FakeVim</source>
         <translation>FakeVim</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimPluginPrivate</name>
     <message>
         <source>Quit FakeVim</source>
         <translation>Esci da FakeVim</translation>
@@ -4514,9 +4505,6 @@ Causa: %3</translation>
         <source>FakeVim Information</source>
         <translation>Informazioni su FakeVim</translation>
     </message>
-</context>
-<context>
-    <name>FakeVimOptionPage</name>
     <message>
         <source>Use FakeVim</source>
         <translation>Usa FakeVim</translation>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index a47e9842ba..c5004714e1 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -2575,7 +2575,7 @@ These prefixes are used in addition to current file name on Switch Header/Source
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal::FakeVimOptionPage</name>
+    <name>::FakeVim</name>
     <message>
         <source>Use FakeVim</source>
         <translation>FakeVim を使用する</translation>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index 10e94697ba..f09dfe8332 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -5198,7 +5198,7 @@ Przebudowanie projektu może pomóc w ich odnalezieniu.</translation>
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal::FakeVimOptionPage</name>
+    <name>::FakeVim</name>
     <message>
         <source>Use FakeVim</source>
         <translation>Używaj FakeVim</translation>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 899a2893a8..b6e1bdba94 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -18518,9 +18518,6 @@ will also disable the following plugins:
             <numerusform>не сохранено %n файлов</numerusform>
         </translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimOptionPage</name>
     <message>
         <source>Use FakeVim</source>
         <translation>Использовать FakeVim</translation>
diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts
index 197db14d4e..c6a765360e 100644
--- a/share/qtcreator/translations/qtcreator_sl.ts
+++ b/share/qtcreator/translations/qtcreator_sl.ts
@@ -4123,7 +4123,7 @@ Razlog: %3</translation>
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal</name>
+    <name>::FakeVim</name>
     <message>
         <source>Use Vim-style Editing</source>
         <translation>Uporabi urejanje v slogu Vim-a</translation>
@@ -4132,9 +4132,6 @@ Razlog: %3</translation>
         <source>Read .vimrc</source>
         <translation>Preberi .vimrc</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimHandler</name>
     <message>
         <source>Not implemented in FakeVim</source>
         <translation>Ni implementirano v FakeVim</translation>
@@ -4225,9 +4222,6 @@ Razlog: %3</translation>
         <source>Can&apos;t open file %1</source>
         <translation type="obsolete">Datoteke %1 ni moč odpreti</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimOptionPage</name>
     <message>
         <source>General</source>
         <translation>Splošno</translation>
@@ -4236,9 +4230,6 @@ Razlog: %3</translation>
         <source>FakeVim</source>
         <translation>FakeVim</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimPluginPrivate</name>
     <message>
         <source>File not saved</source>
         <translation>Datoteka ni shranjena</translation>
@@ -4272,9 +4263,6 @@ Razlog: %3</translation>
         <source>Quit FakeVim</source>
         <translation type="obsolete">Končaj FakeVim</translation>
     </message>
-</context>
-<context>
-    <name>FakeVimOptionPage</name>
     <message>
         <source>Use FakeVim</source>
         <translation>Uporabi FakeVim</translation>
@@ -4296,11 +4284,6 @@ Razlog: %3</translation>
     </message>
     <message>
         <location/>
-        <source>Read .vimrc</source>
-        <translation>Preberi .vimrc</translation>
-    </message>
-    <message>
-        <location/>
         <source>Vim Behavior</source>
         <translation>Obnašanje Vim</translation>
     </message>
@@ -15099,7 +15082,7 @@ Desetiška predznačena vrednost (najprej veliki konec): %4</translation>
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal::FakeVimHandler::Private</name>
+    <name>::FakeVim</name>
     <message>
         <source> [New] </source>
         <translation> [novo] </translation>
@@ -15108,18 +15091,11 @@ Desetiška predznačena vrednost (najprej veliki konec): %4</translation>
         <source>Not an editor command: %1</source>
         <translation>Ni ukaz urejevalnika: %1</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimExCommandsPage</name>
     <message>
         <source>Ex Command Mapping</source>
         <translation>Preslikava ukazov</translation>
     </message>
     <message>
-        <source>FakeVim</source>
-        <translation>FakeVim</translation>
-    </message>
-    <message>
         <source>Ex Trigger Expression</source>
         <translation>Sprožilni izraz</translation>
     </message>
@@ -23128,7 +23104,7 @@ Ali želite poskusiti znova?</translation>
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal::FakeVimUserCommandsModel</name>
+    <name>::FakeVim</name>
     <message>
         <source>Action</source>
         <translation>Dejanje</translation>
@@ -23141,17 +23117,10 @@ Ali želite poskusiti znova?</translation>
         <source>User command #%1</source>
         <translation>%1. uporabniški ukaz</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimUserCommandsPage</name>
     <message>
         <source>User Command Mapping</source>
         <translation>Preslikava uporabniških ukazov</translation>
     </message>
-    <message>
-        <source>FakeVim</source>
-        <translation>FakeVim</translation>
-    </message>
 </context>
 <context>
     <name>::GenericProjectManager</name>
diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts
index fc3b72068f..62940954eb 100644
--- a/share/qtcreator/translations/qtcreator_uk.ts
+++ b/share/qtcreator/translations/qtcreator_uk.ts
@@ -7643,164 +7643,12 @@ will also disable the following plugins:
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal</name>
-    <message>
-        <source>Use Vim-style Editing</source>
-        <translation type="vanished">Використовувати редагування в стилі Vim</translation>
-    </message>
-    <message>
-        <source>Read .vimrc</source>
-        <translation type="vanished">Читати .vimrc</translation>
-    </message>
-    <message>
-        <source>Path to .vimrc</source>
-        <translation type="vanished">Шлях до .vimrc</translation>
-    </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimExCommandsPage</name>
-    <message>
-        <source>Ex Command Mapping</source>
-        <translation type="vanished">Розширене відображення команд</translation>
-    </message>
-    <message>
-        <source>FakeVim</source>
-        <translation type="vanished">FakeVim</translation>
-    </message>
-    <message>
-        <source>Regular expression:</source>
-        <translation type="vanished">Регулярний вираз:</translation>
-    </message>
-    <message>
-        <source>Ex Command</source>
-        <translation type="vanished">Розширена команда</translation>
-    </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimHandler</name>
-    <message>
-        <source>%1%2%</source>
-        <translation type="vanished">%1%2%</translation>
-    </message>
-    <message>
-        <source>%1All</source>
-        <translation type="vanished">%1Все</translation>
-    </message>
-    <message>
-        <source>Not implemented in FakeVim.</source>
-        <translation type="vanished">Не реалізовано в FakeVim.</translation>
-    </message>
+    <name>::FakeVim</name>
     <message>
         <source>Unknown option: </source>
         <translation type="vanished">Невідома опція:</translation>
     </message>
     <message>
-        <source>Unknown option:</source>
-        <translation type="vanished">Невідома опція:</translation>
-    </message>
-    <message>
-        <source>Invalid argument:</source>
-        <translation type="vanished">Неправильний аргумент:</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n lines moved.</source>
-        <translation type="vanished">
-            <numerusform>%n рядок пересунуто.</numerusform>
-            <numerusform>%n рядки пересунуто.</numerusform>
-            <numerusform>%n рядків пересунуто.</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>File &quot;%1&quot; exists (add ! to override)</source>
-        <translation type="vanished">Файл &quot;%1&quot; існує (додайте ! для перезапису)</translation>
-    </message>
-    <message>
-        <source>Cannot open file &quot;%1&quot; for writing</source>
-        <translation type="vanished">Неможливо відкрити файл %1 для запису</translation>
-    </message>
-    <message>
-        <source>&quot;%1&quot; %2 %3L, %4C written.</source>
-        <translation type="vanished">&quot;%1&quot; %2 %3L, %4C записано.</translation>
-    </message>
-    <message>
-        <source>Search hit BOTTOM, continuing at TOP.</source>
-        <translation type="vanished">Пошук дійшов до НИЗУ, продовжуємо ЗГОРИ.</translation>
-    </message>
-    <message>
-        <source>Search hit TOP, continuing at BOTTOM.</source>
-        <translation type="vanished">Пошук дійшов до ГОРИ, продовжуємо ЗНИЗУ.</translation>
-    </message>
-    <message>
-        <source>Search hit BOTTOM without match for: %1</source>
-        <translation type="vanished">Пошук дійшов до НИЗУ, не знайдено збігів для: %1</translation>
-    </message>
-    <message>
-        <source>Search hit TOP without match for: %1</source>
-        <translation type="vanished">Пошук дійшов до ГОРИ, не знайдено збігів для: %1</translation>
-    </message>
-    <message>
-        <source>&quot;%1&quot; %2 %3L, %4C written</source>
-        <translation type="vanished">&quot;%1&quot; %2 %3L, %4C записано</translation>
-    </message>
-    <message>
-        <source>Cannot open file &quot;%1&quot; for reading</source>
-        <translation type="vanished">Неможливо відкрити файл %1 для читання</translation>
-    </message>
-    <message>
-        <source>&quot;%1&quot; %2L, %3C</source>
-        <translation type="vanished">&quot;%1&quot; %2L, %3C</translation>
-    </message>
-    <message>
-        <source>Cannot open file %1</source>
-        <translation type="vanished">Неможливо відкрити %1! {1?}</translation>
-    </message>
-    <message>
-        <source>Pattern not found: %1</source>
-        <translation type="vanished">Зразок не знайдено: %1</translation>
-    </message>
-    <message>
-        <source>Invalid regular expression: %1</source>
-        <translation type="vanished">Неправильний регулярний вираз: %1</translation>
-    </message>
-    <message>
-        <source>Unknown option: %1</source>
-        <translation type="vanished">Невідома опція %1</translation>
-    </message>
-    <message>
-        <source>Argument must be positive: %1=%2</source>
-        <translation type="vanished">Аргумент повинен бути додатнім: %1=%2</translation>
-    </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimHandler::Private</name>
-    <message>
-        <source>Type Alt-V, Alt-V to quit FakeVim mode.</source>
-        <translation type="vanished">Натисніть Alt-V, Alt-V, щоб вийти з режиму FakeVim.</translation>
-    </message>
-    <message>
-        <source> [New] </source>
-        <translation type="vanished"> [Новий] </translation>
-    </message>
-    <message>
-        <source>Not an editor command: %1</source>
-        <translation type="vanished">Не команда редактора: %1</translation>
-    </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimOptionPage</name>
-    <message>
-        <source>General</source>
-        <translation type="vanished">Загальне</translation>
-    </message>
-    <message>
-        <source>FakeVim</source>
-        <translation type="vanished">FakeVim</translation>
-    </message>
-    <message>
-        <source>Default: %1</source>
-        <translation type="vanished">Типово: %1</translation>
-    </message>
-    <message>
         <source>Use FakeVim</source>
         <translation>Застосувати FakeVim</translation>
     </message>
@@ -7905,10 +7753,6 @@ will also disable the following plugins:
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keep empty to use the default path, i.e. %USERPROFILE%\_vimrc on Windows, ~/.vimrc otherwise.</source>
-        <translation type="vanished">Залишіть порожнім, щоб використати типовий шлях (напр.,  %USERPROFILE%\_vimrc під Windows та ~/.vimrc на інших системах).</translation>
-    </message>
-    <message>
         <source>Browse...</source>
         <translation type="vanished">Огляд...</translation>
     </message>
@@ -7936,73 +7780,20 @@ will also disable the following plugins:
         <source>Vim tabstop option.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimPluginPrivate</name>
     <message>
         <source>Meta+V,Meta+V</source>
         <translation type="vanished">Meta+V,Meta+V</translation>
     </message>
     <message>
-        <source>Alt+V,Alt+V</source>
-        <translation type="vanished">Alt+V,Alt+V</translation>
-    </message>
-    <message>
         <source>Meta+V,%1</source>
         <translation type="vanished">Meta+V,%1</translation>
     </message>
     <message>
-        <source>Alt+V,%1</source>
-        <translation type="vanished">Alt+V,%1</translation>
-    </message>
-    <message>
-        <source>File not saved</source>
-        <translation type="vanished">Файл не збережено</translation>
-    </message>
-    <message>
-        <source>Saving succeeded</source>
-        <translation type="vanished">Успішне збереження</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n files not saved</source>
-        <translation type="vanished">
-            <numerusform>%n файл не збережено</numerusform>
-            <numerusform>%n файли не збережено</numerusform>
-            <numerusform>%n файлів не збережено</numerusform>
-        </translation>
-    </message>
-    <message>
         <source>FakeVim Information</source>
         <translation type="vanished">Інформація про FakeVim</translation>
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal::FakeVimUserCommandsModel</name>
-    <message>
-        <source>Action</source>
-        <translation type="vanished">Дія</translation>
-    </message>
-    <message>
-        <source>Command</source>
-        <translation type="vanished">Команда</translation>
-    </message>
-    <message>
-        <source>User command #%1</source>
-        <translation type="vanished">Команда користувача #%1</translation>
-    </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimUserCommandsPage</name>
-    <message>
-        <source>User Command Mapping</source>
-        <translation type="vanished">Відображення команд користувача</translation>
-    </message>
-    <message>
-        <source>FakeVim</source>
-        <translation type="vanished">FakeVim</translation>
-    </message>
-</context>
-<context>
     <name>FileWidget</name>
     <message>
         <source>Open File</source>
@@ -39643,10 +39434,6 @@ Preselects a desktop Qt for building the application if available.</source>
         <translation>Команда користувача #%1</translation>
     </message>
     <message>
-        <source>Meta+V,Meta+V</source>
-        <translation type="vanished">Meta+V,Meta+V</translation>
-    </message>
-    <message>
         <source>Alt+V,Alt+V</source>
         <translation>Alt+V,Alt+V</translation>
     </message>
@@ -39659,10 +39446,6 @@ Preselects a desktop Qt for building the application if available.</source>
         <translation>Виконати дію користувача #%1</translation>
     </message>
     <message>
-        <source>Meta+V,%1</source>
-        <translation type="vanished">Meta+V,%1</translation>
-    </message>
-    <message>
         <source>Alt+V,%1</source>
         <translation>Alt+V,%1</translation>
     </message>
diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts
index 9e14c4e0b7..6e80d0e8b5 100644
--- a/share/qtcreator/translations/qtcreator_zh_TW.ts
+++ b/share/qtcreator/translations/qtcreator_zh_TW.ts
@@ -4206,7 +4206,7 @@ Reason: %3</source>
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal</name>
+    <name>::FakeVim</name>
     <message>
         <source>Use Vim-style Editing</source>
         <translation>使用 Vim 風格編輯</translation>
@@ -4215,9 +4215,6 @@ Reason: %3</source>
         <source>Read .vimrc</source>
         <translation>讀取 .vimrc</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimHandler</name>
     <message>
         <source>Not implemented in FakeVim</source>
         <translation>在 FakeVim 中尚未實作</translation>
@@ -4306,9 +4303,6 @@ Reason: %3</source>
         <source>Argument must be positive: %1=%2</source>
         <translation>參數必須為正值：%1=%2</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimOptionPage</name>
     <message>
         <source>General</source>
         <translation>一般</translation>
@@ -4322,10 +4316,6 @@ Reason: %3</source>
         <translation>使用 FakeVim</translation>
     </message>
     <message>
-        <source>Read .vimrc</source>
-        <translation>讀取 .vimrc</translation>
-    </message>
-    <message>
         <source>Vim Behavior</source>
         <translation>Vim 行為</translation>
     </message>
@@ -4409,9 +4399,6 @@ Reason: %3</source>
         <source>Use smartcase</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimPluginPrivate</name>
     <message>
         <source>Meta+V,Meta+V</source>
         <translation type="unfinished"></translation>
@@ -12533,16 +12520,12 @@ For qmlproject projects, use the importPaths property to add import paths.</sour
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal::FakeVimExCommandsPage</name>
+    <name>::FakeVim</name>
     <message>
         <source>Ex Command Mapping</source>
         <translation>Ex 指令映射</translation>
     </message>
     <message>
-        <source>FakeVim</source>
-        <translation>FakeVim</translation>
-    </message>
-    <message>
         <source>Ex Trigger Expression</source>
         <translation>Ex 觸發表示式</translation>
     </message>
@@ -14780,7 +14763,7 @@ Ids must begin with a lowercase letter.</source>
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal::FakeVimHandler::Private</name>
+    <name>::FakeVim</name>
     <message>
         <source> [New] </source>
         <translation> [新增] </translation>
@@ -21240,7 +21223,7 @@ Would you like to overwrite them?</source>
     </message>
 </context>
 <context>
-    <name>FakeVim::Internal::FakeVimUserCommandsModel</name>
+    <name>::FakeVim</name>
     <message>
         <source>Action</source>
         <translation>動作</translation>
@@ -21253,17 +21236,10 @@ Would you like to overwrite them?</source>
         <source>User command #%1</source>
         <translation>使用者指令 #%1</translation>
     </message>
-</context>
-<context>
-    <name>FakeVim::Internal::FakeVimUserCommandsPage</name>
     <message>
         <source>User Command Mapping</source>
         <translation>使用者指令映射</translation>
     </message>
-    <message>
-        <source>FakeVim</source>
-        <translation>FakeVim</translation>
-    </message>
 </context>
 <context>
     <name>::GenericProjectManager</name>
diff --git a/src/plugins/fakevim/fakevimactions.cpp b/src/plugins/fakevim/fakevimactions.cpp
index f72ef44a38..7f7c44baf4 100644
--- a/src/plugins/fakevim/fakevimactions.cpp
+++ b/src/plugins/fakevim/fakevimactions.cpp
@@ -3,6 +3,7 @@
 
 #include "fakevimactions.h"
 #include "fakevimhandler.h"
+#include "fakevimtr.h"
 
 // Please do not add any direct dependencies to other Qt Creator code  here.
 // Instead emit signals and let the FakeVimPlugin channel the information to
@@ -66,40 +67,40 @@ FakeVimSettings::FakeVimSettings()
     setAutoApply(false);
 
 #ifndef FAKEVIM_STANDALONE
-    setup(&useFakeVim,     false, "UseFakeVim",     {},    tr("Use FakeVim"));
+    setup(&useFakeVim,     false, "UseFakeVim",     {},    Tr::tr("Use FakeVim"));
 #endif
     // Specific FakeVim settings
-    setup(&readVimRc,      false, "ReadVimRc",      {},    tr("Read .vimrc from location:"));
-    setup(&vimRcPath,      QString(), "VimRcPath",  {},    {}); // tr("Path to .vimrc")
-    setup(&showMarks,      false, "ShowMarks",      "sm",  tr("Show position of text marks"));
-    setup(&passControlKey, false, "PassControlKey", "pck", tr("Pass control keys"));
-    setup(&passKeys,       true,  "PassKeys",       "pk",  tr("Pass keys in insert mode"));
+    setup(&readVimRc,      false, "ReadVimRc",      {},    Tr::tr("Read .vimrc from location:"));
+    setup(&vimRcPath,      QString(), "VimRcPath",  {},    {}); // Tr::tr("Path to .vimrc")
+    setup(&showMarks,      false, "ShowMarks",      "sm",  Tr::tr("Show position of text marks"));
+    setup(&passControlKey, false, "PassControlKey", "pck", Tr::tr("Pass control keys"));
+    setup(&passKeys,       true,  "PassKeys",       "pk",  Tr::tr("Pass keys in insert mode"));
 
     // Emulated Vsetting
-    setup(&startOfLine,    true,  "StartOfLine",    "sol", tr("Start of line"));
-    setup(&tabStop,        8,     "TabStop",        "ts",  tr("Tabulator size:"));
-    setup(&smartTab,       false, "SmartTab",       "sta", tr("Smart tabulators"));
-    setup(&hlSearch,       true,  "HlSearch",       "hls", tr("Highlight search results"));
-    setup(&shiftWidth,     8,     "ShiftWidth",     "sw",  tr("Shift width:"));
-    setup(&expandTab,      false, "ExpandTab",      "et",  tr("Expand tabulators"));
-    setup(&autoIndent,     false, "AutoIndent",     "ai",  tr("Automatic indentation"));
-    setup(&smartIndent,    false, "SmartIndent",    "si",  tr("Smart indentation"));
-    setup(&incSearch,      true,  "IncSearch",      "is",  tr("Incremental search"));
-    setup(&useCoreSearch,  false, "UseCoreSearch",  "ucs", tr("Use search dialog"));
-    setup(&smartCase,      false, "SmartCase",      "scs", tr("Use smartcase"));
-    setup(&ignoreCase,     false, "IgnoreCase",     "ic",  tr("Use ignorecase"));
-    setup(&wrapScan,       true,  "WrapScan",       "ws",  tr("Use wrapscan"));
-    setup(&tildeOp,        false, "TildeOp",        "top", tr("Use tildeop"));
-    setup(&showCmd,        true,  "ShowCmd",        "sc",  tr("Show partial command"));
-    setup(&relativeNumber, false, "RelativeNumber", "rnu", tr("Show line numbers relative to cursor"));
-    setup(&blinkingCursor, false, "BlinkingCursor", "bc",  tr("Blinking cursor"));
-    setup(&scrollOff,      0,     "ScrollOff",      "so",  tr("Scroll offset:"));
+    setup(&startOfLine,    true,  "StartOfLine",    "sol", Tr::tr("Start of line"));
+    setup(&tabStop,        8,     "TabStop",        "ts",  Tr::tr("Tabulator size:"));
+    setup(&smartTab,       false, "SmartTab",       "sta", Tr::tr("Smart tabulators"));
+    setup(&hlSearch,       true,  "HlSearch",       "hls", Tr::tr("Highlight search results"));
+    setup(&shiftWidth,     8,     "ShiftWidth",     "sw",  Tr::tr("Shift width:"));
+    setup(&expandTab,      false, "ExpandTab",      "et",  Tr::tr("Expand tabulators"));
+    setup(&autoIndent,     false, "AutoIndent",     "ai",  Tr::tr("Automatic indentation"));
+    setup(&smartIndent,    false, "SmartIndent",    "si",  Tr::tr("Smart indentation"));
+    setup(&incSearch,      true,  "IncSearch",      "is",  Tr::tr("Incremental search"));
+    setup(&useCoreSearch,  false, "UseCoreSearch",  "ucs", Tr::tr("Use search dialog"));
+    setup(&smartCase,      false, "SmartCase",      "scs", Tr::tr("Use smartcase"));
+    setup(&ignoreCase,     false, "IgnoreCase",     "ic",  Tr::tr("Use ignorecase"));
+    setup(&wrapScan,       true,  "WrapScan",       "ws",  Tr::tr("Use wrapscan"));
+    setup(&tildeOp,        false, "TildeOp",        "top", Tr::tr("Use tildeop"));
+    setup(&showCmd,        true,  "ShowCmd",        "sc",  Tr::tr("Show partial command"));
+    setup(&relativeNumber, false, "RelativeNumber", "rnu", Tr::tr("Show line numbers relative to cursor"));
+    setup(&blinkingCursor, false, "BlinkingCursor", "bc",  Tr::tr("Blinking cursor"));
+    setup(&scrollOff,      0,     "ScrollOff",      "so",  Tr::tr("Scroll offset:"));
     setup(&backspace,      "indent,eol,start",
-                                  "Backspace",      "bs",  tr("Backspace:"));
+                                  "Backspace",      "bs",  Tr::tr("Backspace:"));
     setup(&isKeyword,      "@,48-57,_,192-255,a-z,A-Z",
-                                  "IsKeyword",      "isk", tr("Keyword characters:"));
-    setup(&clipboard,      {},    "Clipboard",      "cb",  tr(""));
-    setup(&formatOptions,  {},    "formatoptions",  "fo",  tr(""));
+                                  "IsKeyword",      "isk", Tr::tr("Keyword characters:"));
+    setup(&clipboard,      {},    "Clipboard",      "cb",  Tr::tr(""));
+    setup(&formatOptions,  {},    "formatoptions",  "fo",  Tr::tr(""));
 
     // Emulated plugins
     setup(&emulateVimCommentary, false, "commentary", {}, "vim-commentary");
@@ -109,19 +110,19 @@ FakeVimSettings::FakeVimSettings()
     setup(&emulateSurround, false, "surround", {}, "vim-surround");
 
     // Some polish
-    useFakeVim.setDisplayName(tr("Use Vim-style Editing"));
+    useFakeVim.setDisplayName(Tr::tr("Use Vim-style Editing"));
 
-    relativeNumber.setToolTip(tr("Displays line numbers relative to the line containing "
+    relativeNumber.setToolTip(Tr::tr("Displays line numbers relative to the line containing "
         "text cursor."));
 
-    passControlKey.setToolTip(tr("Does not interpret key sequences like Ctrl-S in FakeVim "
+    passControlKey.setToolTip(Tr::tr("Does not interpret key sequences like Ctrl-S in FakeVim "
         "but handles them as regular shortcuts. This gives easier access to core functionality "
         "at the price of losing some features of FakeVim."));
 
-    passKeys.setToolTip(tr("Does not interpret some key presses in insert mode so that "
+    passKeys.setToolTip(Tr::tr("Does not interpret some key presses in insert mode so that "
         "code can be properly completed and expanded."));
 
-    tabStop.setToolTip(tr("Vim tabstop option."));
+    tabStop.setToolTip(Tr::tr("Vim tabstop option."));
 
 #ifndef FAKEVIM_STANDALONE
     backspace.setDisplayStyle(FvStringAspect::LineEditDisplay);
@@ -130,9 +131,9 @@ FakeVimSettings::FakeVimSettings()
     const QString vimrcDefault = QLatin1String(HostOsInfo::isAnyUnixHost()
                 ? "$HOME/.vimrc" : "%USERPROFILE%\\_vimrc");
     vimRcPath.setExpectedKind(PathChooser::File);
-    vimRcPath.setToolTip(tr("Keep empty to use the default path, i.e. "
+    vimRcPath.setToolTip(Tr::tr("Keep empty to use the default path, i.e. "
                "%USERPROFILE%\\_vimrc on Windows, ~/.vimrc otherwise."));
-    vimRcPath.setPlaceHolderText(tr("Default: %1").arg(vimrcDefault));
+    vimRcPath.setPlaceHolderText(Tr::tr("Default: %1").arg(vimrcDefault));
     vimRcPath.setDisplayStyle(FvStringAspect::PathChooserDisplay);
 #endif
 }
@@ -148,10 +149,10 @@ QString FakeVimSettings::trySetValue(const QString &name, const QString &value)
 {
     FvBaseAspect *aspect = m_nameToAspect.value(name, nullptr);
     if (!aspect)
-        return tr("Unknown option: %1").arg(name);
+        return Tr::tr("Unknown option: %1").arg(name);
     if (aspect == &tabStop || aspect == &shiftWidth) {
         if (value.toInt() <= 0)
-            return tr("Argument must be positive: %1=%2")
+            return Tr::tr("Argument must be positive: %1=%2")
                     .arg(name).arg(value);
     }
     aspect->setValue(value);
diff --git a/src/plugins/fakevim/fakevimactions.h b/src/plugins/fakevim/fakevimactions.h
index a959b284e6..6f7e303f0f 100644
--- a/src/plugins/fakevim/fakevimactions.h
+++ b/src/plugins/fakevim/fakevimactions.h
@@ -75,8 +75,6 @@ using FvStringAspect = Utils::StringAspect;
 
 class FakeVimSettings final : public FvAspectContainer
 {
-    Q_DECLARE_TR_FUNCTIONS(FakeVim)
-
 public:
     FakeVimSettings();
     ~FakeVimSettings();