diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index ca905d5a1f4bc144c3261cd7d546e0aa16edac42..9b57adaf1f7b493570116cc33fe3ffb9266570e3 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -2582,9 +2582,9 @@ Sollen sie Ã¼berschrieben werden?</translation>
     </message>
 </context>
 <context>
-    <name>CppTools::Internal::CppQuickOpenFilter</name>
+    <name>CppTools::Internal::CppLocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppquickopenfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+53"/>
         <source>Classes and Methods</source>
         <translation>Klassen und Methoden</translation>
     </message>
@@ -7583,7 +7583,7 @@ Grund: %3</translation>
 <context>
     <name>Locator</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenconstants.h" line="+38"/>
+        <location filename="../../../src/plugins/locator/locatorconstants.h" line="+38"/>
         <source>Filters</source>
         <translation>Filter</translation>
     </message>
@@ -12601,9 +12601,9 @@ Bitte prÃ¼fen Sie, ob das GerÃ¤t verbunden ist und die Anwendung &apos;TRK&apos;
     </message>
 </context>
 <context>
-    <name>QuickOpen::IQuickOpenFilter</name>
+    <name>Locator::ILocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/iquickopenfilter.cpp" line="+86"/>
+        <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
         <source>Filter Configuration</source>
         <translation>Filterkonfiguration</translation>
     </message>
@@ -12619,9 +12619,9 @@ Bitte prÃ¼fen Sie, ob das GerÃ¤t verbunden ist und die Anwendung &apos;TRK&apos;
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilter</name>
+    <name>Locator::Internal::DirectoryFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.cpp" line="+44"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
         <source>Generic Directory Filter</source>
         <translation>Allgemeines Verzeichnisfilter</translation>
     </message>
@@ -12656,9 +12656,9 @@ Bitte prÃ¼fen Sie, ob das GerÃ¤t verbunden ist und die Anwendung &apos;TRK&apos;
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilterOptions</name>
+    <name>Locator::Internal::DirectoryFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.ui"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
         <source>Name:</source>
         <translation>Name:</translation>
     </message>
@@ -12711,17 +12711,17 @@ Um es abzurufen, tippen Sie das KÃ¼rzel im Locator, gefolgt  von einem Leerzeich
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilter</name>
+    <name>Locator::Internal::FileSystemFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.h" line="+54"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
         <source>Files in file system</source>
         <translation>Dateien aus dem Dateisystem</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilterOptions</name>
+    <name>Locator::Internal::FileSystemFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.ui"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
         <source>Filter configuration</source>
         <translation>Filterkonfiguration</translation>
     </message>
@@ -12747,33 +12747,33 @@ Um es abzurufen, tippen Sie das KÃ¼rzel im Locator, gefolgt  von einem Leerzeich
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::OpenDocumentsFilter</name>
+    <name>Locator::Internal::OpenDocumentsFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/opendocumentsfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
         <source>Open documents</source>
         <translation>Offene Dokumente</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenFiltersFilter</name>
+    <name>Locator::Internal::LocatorFiltersFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenfiltersfilter.cpp" line="+53"/>
+        <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
         <source>Available filters</source>
         <translation>VerfÃ¼gbare Filter</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenPlugin</name>
+    <name>Locator::Internal::LocatorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenplugin.cpp" line="+247"/>
+        <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+247"/>
         <source>Indexing</source>
         <translation>Indizierung</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenToolWindow</name>
+    <name>Locator::Internal::LocatorWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopentoolwindow.cpp" line="+254"/>
+        <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
         <source>Refresh</source>
         <translation>Aktualisieren</translation>
     </message>
@@ -12799,9 +12799,9 @@ Um es abzurufen, tippen Sie das KÃ¼rzel im Locator, gefolgt  von einem Leerzeich
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsDialog</name>
+    <name>Locator::Internal::SettingsDialog</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingswidget.ui"/>
+        <location filename="../../../src/plugins/locator/settingswidget.ui"/>
         <source>Configure Filters</source>
         <translation>Filter konfigurieren</translation>
     </message>
@@ -12837,17 +12837,17 @@ Um es abzurufen, tippen Sie das KÃ¼rzel im Locator, gefolgt  von einem Leerzeich
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsPage</name>
+    <name>Locator::Internal::SettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.cpp" line="+159"/>
+        <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
         <source>%1 (Prefix: %2)</source>
         <translation>%1 (PrÃ¤fix: %2)</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsWidget</name>
+    <name>Locator::Internal::SettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.ui"/>
+        <location filename="../../../src/plugins/locator/settingspage.ui"/>
         <source>Configure Filters</source>
         <translation>Filterkonfiguration</translation>
     </message>
diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts
index 6511ae016e395c306c28084a4bcadebdb646ac56..d8b324365138bee6812c1e675d25790702fcc256 100644
--- a/share/qtcreator/translations/qtcreator_es.ts
+++ b/share/qtcreator/translations/qtcreator_es.ts
@@ -2835,9 +2835,9 @@ Would you like to overwrite them?</source>
     </message>
 </context>
 <context>
-    <name>CppTools::Internal::CppQuickOpenFilter</name>
+    <name>CppTools::Internal::CppLocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppquickopenfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+53"/>
         <source>Classes and Methods</source>
         <translation>Clases y mÃ©todos</translation>
     </message>
@@ -7791,7 +7791,7 @@ Skipping file.</source>
 <context>
     <name>Locator</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenconstants.h" line="+38"/>
+        <location filename="../../../src/plugins/locator/locatorconstants.h" line="+38"/>
         <source>Filters</source>
         <translation>Filtros</translation>
     </message>
@@ -11581,9 +11581,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::IQuickOpenFilter</name>
+    <name>Locator::ILocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/iquickopenfilter.cpp" line="+86"/>
+        <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
         <source>Filter Configuration</source>
         <translation>Filtro de configuraciÃ³n</translation>
     </message>
@@ -11599,9 +11599,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilter</name>
+    <name>Locator::Internal::DirectoryFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.cpp" line="+44"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
         <source>Generic Directory Filter</source>
         <translation>Filtro genÃ©rico de directorios</translation>
     </message>
@@ -11636,9 +11636,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilterOptions</name>
+    <name>Locator::Internal::DirectoryFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.ui"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
         <source>Name:</source>
         <translation>Nombre:</translation>
     </message>
@@ -11691,17 +11691,17 @@ Para hacerlo, introduzca el atajo y un espacio en el campo LocalizaciÃ³n, y lueg
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilter</name>
+    <name>Locator::Internal::FileSystemFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.h" line="+54"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
         <source>Files in file system</source>
         <translation>Archivos en el sistema de archivos</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilterOptions</name>
+    <name>Locator::Internal::FileSystemFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.ui"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
         <source>Filter configuration</source>
         <translation>Ajustes de filtros</translation>
     </message>
@@ -11727,33 +11727,33 @@ Para hacerlo, introduzca el atajo y un espacio en el campo LocalizaciÃ³n, y lueg
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::OpenDocumentsFilter</name>
+    <name>Locator::Internal::OpenDocumentsFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/opendocumentsfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
         <source>Open documents</source>
         <translation>Documentos abiertos</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenFiltersFilter</name>
+    <name>Locator::Internal::LocatorFiltersFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenfiltersfilter.cpp" line="+53"/>
+        <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
         <source>Available filters</source>
         <translation>Filtros disponibles</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenPlugin</name>
+    <name>Locator::Internal::LocatorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenplugin.cpp" line="+247"/>
+        <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+247"/>
         <source>Indexing</source>
         <translation>Indizando</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenToolWindow</name>
+    <name>Locator::Internal::LocatorWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopentoolwindow.cpp" line="+254"/>
+        <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
         <source>Refresh</source>
         <translation>Refrescar</translation>
     </message>
@@ -11779,9 +11779,9 @@ Para hacerlo, introduzca el atajo y un espacio en el campo LocalizaciÃ³n, y lueg
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsDialog</name>
+    <name>Locator::Internal::SettingsDialog</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingswidget.ui"/>
+        <location filename="../../../src/plugins/locator/settingswidget.ui"/>
         <source>Configure Filters</source>
         <translation>Ajustar filtros</translation>
     </message>
@@ -11817,17 +11817,17 @@ Para hacerlo, introduzca el atajo y un espacio en el campo LocalizaciÃ³n, y lueg
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsPage</name>
+    <name>Locator::Internal::SettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.cpp" line="+159"/>
+        <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
         <source>%1 (Prefix: %2)</source>
         <translation>%1 (Prefijo: %2)</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsWidget</name>
+    <name>Locator::Internal::SettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.ui"/>
+        <location filename="../../../src/plugins/locator/settingspage.ui"/>
         <source>Configure Filters</source>
         <translation>Ajustar filtros</translation>
     </message>
@@ -12885,7 +12885,7 @@ Para hacerlo, introduzca el atajo y un espacio en el campo LocalizaciÃ³n, y lueg
     </message>
     <message>
         <source>
-	This is only an example.</source>
+        This is only an example.</source>
         <translation type="obsolete">Esto es simplemente un ejemplo.</translation>
     </message>
 </context>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index afbd79e2b742db3b99ea16e7c4bca1243199a27a..e77be508a0ca569a4e3f674489ed6cacb5a0a69c 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -7,7 +7,7 @@
         <location filename="../../../src/app/main.cpp" line="+147"/>
         <source>Failed to load core: %1</source>
         <translatorcomment>traduire core ?</translatorcomment>
-        <translation type="unfinished">Ã‰chec dans le chargement du coreÂ : %1</translation>
+        <translation type="unfinished">Ã‰chec dans le chargement du core : %1</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -39,13 +39,13 @@
     <message>
         <location/>
         <source>Executable:</source>
-        <translation>ExÃ©cutableÂ :</translation>
+        <translation>ExÃ©cutable :</translation>
     </message>
     <message>
         <location/>
         <source>Core File:</source>
         <translatorcomment>&apos;core&apos; encore...</translatorcomment>
-        <translation type="unfinished">Fichier CoreÂ :</translation>
+        <translation type="unfinished">Fichier Core :</translation>
     </message>
 </context>
 <context>
@@ -59,12 +59,12 @@
         <location/>
         <source>Attach to Process ID:</source>
         <translatorcomment>PID ?</translatorcomment>
-        <translation type="unfinished">Attacher au processus d&apos;IDÂ :</translation>
+        <translation type="unfinished">Attacher au processus d&apos;ID :</translation>
     </message>
     <message>
         <location/>
         <source>Filter:</source>
-        <translation>FiltreÂ :</translation>
+        <translation>Filtre :</translation>
     </message>
     <message>
         <location/>
@@ -80,19 +80,19 @@
     </message>
     <message>
         <source>Host and port:</source>
-        <translation type="obsolete">HÃ´te et portÂ :</translation>
+        <translation type="obsolete">HÃ´te et port :</translation>
     </message>
     <message>
         <source>Architecture:</source>
-        <translation type="obsolete">ArchitectureÂ :</translation>
+        <translation type="obsolete">Architecture :</translation>
     </message>
     <message>
         <source>Use server start script:</source>
-        <translation type="obsolete">Utiliser le script de dÃ©marrage du serveurÂ :</translation>
+        <translation type="obsolete">Utiliser le script de dÃ©marrage du serveur :</translation>
     </message>
     <message>
         <source>Server start script:</source>
-        <translation type="obsolete">Script de dÃ©marrage du serveurÂ :</translation>
+        <translation type="obsolete">Script de dÃ©marrage du serveur :</translation>
     </message>
 </context>
 <context>
@@ -118,12 +118,12 @@
     <message>
         <location/>
         <source>Bookmark:</source>
-        <translation>SignetÂ :</translation>
+        <translation>Signet :</translation>
     </message>
     <message>
         <location/>
         <source>Add in Folder:</source>
-        <translation>Ajouter dans le dossierÂ :</translation>
+        <translation>Ajouter dans le dossier :</translation>
     </message>
     <message>
         <location/>
@@ -218,7 +218,7 @@
     <message>
         <location line="+38"/>
         <source>Filter:</source>
-        <translation>FiltreÂ :</translation>
+        <translation>Filtre :</translation>
     </message>
     <message>
         <location line="+26"/>
@@ -334,7 +334,7 @@
     <message>
         <location/>
         <source>Function to break on:</source>
-        <translation>Fonction Ã  interrompreÂ :</translation>
+        <translation>Fonction Ã  interrompre :</translation>
     </message>
 </context>
 <context>
@@ -342,7 +342,7 @@
     <message>
         <location filename="../../../src/plugins/debugger/breakcondition.ui"/>
         <source>Condition:</source>
-        <translation>ConditionÂ :</translation>
+        <translation>Condition :</translation>
     </message>
     <message>
         <location/>
@@ -402,7 +402,7 @@
     <message>
         <location filename="../../../src/plugins/cmakeprojectmanager/cmakerunconfiguration.cpp" line="+247"/>
         <source>Arguments:</source>
-        <translation>ArgumentsÂ :</translation>
+        <translation>Arguments :</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -417,7 +417,7 @@
     <message>
         <location line="+7"/>
         <source>Working Directory:</source>
-        <translation>RÃ©pertoire de travailÂ :</translation>
+        <translation>RÃ©pertoire de travail :</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -451,7 +451,7 @@
     <message>
         <location line="-97"/>
         <source>Base environment for this runconfiguration:</source>
-        <translation>Environnement de base pour cette configuration d&apos;Ã©xecutionÂ :</translation>
+        <translation>Environnement de base pour cette configuration d&apos;Ã©xecution :</translation>
     </message>
 </context>
 <context>
@@ -563,12 +563,12 @@
     <message>
         <location filename="../../../src/plugins/cmakeprojectmanager/makestep.cpp" line="+163"/>
         <source>Additional arguments:</source>
-        <translation type="unfinished">Arguments supplÃ©mentairesÂ :</translation>
+        <translation type="unfinished">Arguments supplÃ©mentaires :</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Targets:</source>
-        <translation type="unfinished">CiblesÂ :</translation>
+        <translation type="unfinished">Cibles :</translation>
     </message>
     <message>
         <location line="+59"/>
@@ -591,7 +591,7 @@
     <message>
         <location line="+8"/>
         <source>Build directory:</source>
-        <translation type="unfinished">RÃ©pertoire de compilationÂ :</translation>
+        <translation type="unfinished">RÃ©pertoire de compilation :</translation>
     </message>
 </context>
 <context>
@@ -630,7 +630,7 @@
     <message>
         <location/>
         <source>Path:</source>
-        <translation>CheminÂ :</translation>
+        <translation>Chemin :</translation>
     </message>
     <message>
         <location/>
@@ -640,12 +640,12 @@
     <message>
         <location/>
         <source>Symbol paths:</source>
-        <translation type="unfinished">Chemins des symbolesÂ :</translation>
+        <translation type="unfinished">Chemins des symboles :</translation>
     </message>
     <message>
         <location/>
         <source>Source paths:</source>
-        <translation type="unfinished">Chemins des sourcesÂ :</translation>
+        <translation type="unfinished">Chemins des sources :</translation>
     </message>
     <message>
         <location filename="../../../src/plugins/debugger/cdb/cdboptionspage.cpp" line="+58"/>
@@ -679,7 +679,7 @@
     <message>
         <location filename="../../../src/plugins/git/changeselectiondialog.ui"/>
         <source>Repository Location:</source>
-        <translation>Adresse du depÃ´tÂ :</translation>
+        <translation>Adresse du depÃ´t :</translation>
     </message>
     <message>
         <location/>
@@ -689,7 +689,7 @@
     <message>
         <location/>
         <source>Change:</source>
-        <translation>ModificationÂ :</translation>
+        <translation>Modification :</translation>
     </message>
 </context>
 <context>
@@ -758,7 +758,7 @@
         <location filename="../../../src/plugins/cpaster/pasteselect.ui"/>
         <source>Paste:</source>
         <translatorcomment>quelque chose de plus franÃ§ais pour la rÃ©fÃ©rence de paste?</translatorcomment>
-        <translation type="unfinished">CollageÂ :</translation>
+        <translation type="unfinished">Collage :</translation>
     </message>
     <message>
         <location/>
@@ -776,12 +776,12 @@
     </message>
     <message>
         <source>CodePaster Server:</source>
-        <translation type="obsolete">Serveur CodePasterÂ :</translation>
+        <translation type="obsolete">Serveur CodePaster :</translation>
     </message>
     <message>
         <location/>
         <source>Username:</source>
-        <translation>Nom d&apos;utilisateurÂ :</translation>
+        <translation>Nom d&apos;utilisateur :</translation>
     </message>
     <message>
         <location/>
@@ -851,7 +851,7 @@
     </message>
     <message>
         <source>Checking this will enable tooltips for variable values during debugging. Since this can slow down debugging and does not provide reliable information as it does not use scope information, it is switched off by default.</source>
-        <translatorcomment>shuntÃ© le coup de la &quot;scope information&quot;...Â :/</translatorcomment>
+        <translatorcomment>shuntÃ© le coup de la &quot;scope information&quot;... :/</translatorcomment>
         <translation type="obsolete">Active les info-bulles sur les variables pendant le dÃ©boguage. Comme ceci peut ralentir le dÃ©boguage et ne fournit pas nÃ©cessairement des valeurs fiables, cette option est dÃ©sactivÃ©e par dÃ©fault.</translation>
     </message>
     <message>
@@ -866,7 +866,7 @@
     <message>
         <location/>
         <source>Maximal stack depth:</source>
-        <translation>Profondeur maximale de la pileÂ :</translation>
+        <translation>Profondeur maximale de la pile :</translation>
     </message>
     <message>
         <location/>
@@ -945,12 +945,12 @@
     <message>
         <location line="+12"/>
         <source>Unable to open %1 for writing: %2</source>
-        <translation type="unfinished">Impossible d&apos;ouvrir %1 pour Ã©crireÂ : %2</translation>
+        <translation type="unfinished">Impossible d&apos;ouvrir %1 pour Ã©crire : %2</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>Error while writing to %1: %2</source>
-        <translation type="unfinished">Erreur pendant l&apos;Ã©criture de %1Â : %2</translation>
+        <translation type="unfinished">Erreur pendant l&apos;Ã©criture de %1 : %2</translation>
     </message>
     <message>
         <location line="+296"/>
@@ -990,7 +990,7 @@
         <location line="+34"/>
         <source>The project directory %1 contains files which cannot be overwritten:
 %2.</source>
-        <translation type="unfinished">Le rÃ©pertoire du projet %1 contient des fichiers qui ne peuvent Ãªtre Ã©crasÃ©sÂ :
+        <translation type="unfinished">Le rÃ©pertoire du projet %1 contient des fichiers qui ne peuvent Ãªtre Ã©crasÃ©s :
 %2.</translation>
     </message>
     <message>
@@ -998,7 +998,7 @@
         <source>The following files already exist in the directory %1:
 %2.
 Would you like to overwrite them?</source>
-        <translation type="unfinished">Les fichiers suivants existent dÃ©jÃ  dans le rÃ©pertoire %1Â :
+        <translation type="unfinished">Les fichiers suivants existent dÃ©jÃ  dans le rÃ©pertoire %1 :
 %2,
 Voulez vous les Ã©craser?</translation>
     </message>
@@ -1465,7 +1465,7 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location/>
         <source>User &amp;interface color:</source>
-        <translation type="unfinished">Couleur de l&apos;&amp;interface utilisateurÂ :</translation>
+        <translation type="unfinished">Couleur de l&apos;&amp;interface utilisateur :</translation>
     </message>
     <message>
         <location/>
@@ -1480,12 +1480,12 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location/>
         <source>Terminal:</source>
-        <translation type="unfinished">TerminalÂ :</translation>
+        <translation type="unfinished">Terminal :</translation>
     </message>
     <message>
         <location/>
         <source>External editor:</source>
-        <translation type="unfinished">Ã‰diteur externeÂ :</translation>
+        <translation type="unfinished">Ã‰diteur externe :</translation>
     </message>
     <message>
         <location/>
@@ -1823,7 +1823,7 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location filename="../../../src/plugins/coreplugin/dialogs/openwithdialog.cpp" line="+43"/>
         <source>Open file &apos;%1&apos; with:</source>
-        <translation>Ouvrir le fichier %1 avecÂ :</translation>
+        <translation>Ouvrir le fichier %1 avec :</translation>
     </message>
 </context>
 <context>
@@ -2138,7 +2138,7 @@ Voulez vous les Ã©craser?</translation>
         <location filename="../../../src/plugins/coreplugin/scriptmanager/scriptmanager.cpp" line="+228"/>
         <source>Exception at line %1: %2
 %3</source>
-        <translation type="unfinished">Exception Ã  la ligne %1Â : %2
+        <translation type="unfinished">Exception Ã  la ligne %1 : %2
 %3</translation>
     </message>
     <message>
@@ -2196,7 +2196,7 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location filename="../../../src/libs/utils/consoleprocess.cpp" line="+49"/>
         <source>Cannot set up communication channel: %1</source>
-        <translation>Impossible d&apos;Ã©tablir le canal de communicationÂ : %1</translation>
+        <translation>Impossible d&apos;Ã©tablir le canal de communication : %1</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -2206,12 +2206,12 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location line="+5"/>
         <source>Cannot create temporary file: %1</source>
-        <translation>Impossible de crÃ©er un fichier temporaireÂ : %1</translation>
+        <translation>Impossible de crÃ©er un fichier temporaire : %1</translation>
     </message>
     <message>
         <location line="+5"/>
         <source>Cannot create temporary directory &apos;%1&apos;: %2</source>
-        <translation>Impossible de crÃ©er un dossier temporaire &apos;%1&apos;Â : %2</translation>
+        <translation>Impossible de crÃ©er un dossier temporaire &apos;%1&apos; : %2</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2221,7 +2221,7 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location line="+5"/>
         <source>Cannot change to working directory &apos;%1&apos;: %2</source>
-        <translation type="unfinished">Impossible de changer le rÃ©pertoire de travail &apos;%1&apos;Â : %2</translation>
+        <translation type="unfinished">Impossible de changer le rÃ©pertoire de travail &apos;%1&apos; : %2</translation>
     </message>
     <message>
         <location line="+5"/>
@@ -2241,17 +2241,17 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location filename="../../../src/libs/utils/consoleprocess_win.cpp" line="+125"/>
         <source>The process &apos;%1&apos; could not be started: %2</source>
-        <translation type="unfinished">Le processus &apos;%1&apos; ne peut pas Ãªtre dÃ©marrÃ©Â : %2</translation>
+        <translation type="unfinished">Le processus &apos;%1&apos; ne peut pas Ãªtre dÃ©marrÃ© : %2</translation>
     </message>
     <message>
         <location line="+70"/>
         <source>Cannot obtain a handle to the inferior: %1</source>
-        <translation type="unfinished">Impossible d&apos;obtenir le descripteur du processusÂ : %1</translation>
+        <translation type="unfinished">Impossible d&apos;obtenir le descripteur du processus : %1</translation>
     </message>
     <message>
         <location line="+30"/>
         <source>Cannot obtain exit status from inferior: %1</source>
-        <translation type="unfinished">Impossible d&apos;obtenir la valeur de retour du processusÂ : %1</translation>
+        <translation type="unfinished">Impossible d&apos;obtenir la valeur de retour du processus : %1</translation>
     </message>
 </context>
 <context>
@@ -2264,7 +2264,7 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location line="+8"/>
         <source>The name must not contain any of the characters &apos;%1&apos;.</source>
-        <translation>Le nom ne peut pas contenir un des caractÃ¨res suivantÂ : &apos;%1&apos;.</translation>
+        <translation>Le nom ne peut pas contenir un des caractÃ¨res suivant : &apos;%1&apos;.</translation>
     </message>
     <message>
         <location line="+9"/>
@@ -2283,24 +2283,24 @@ Voulez vous les Ã©craser?</translation>
         <location filename="../../../src/libs/utils/filesearch.cpp" line="+47"/>
         <source>%1: canceled. %n occurrences found in %2 files.</source>
         <translation>
-            <numerusform>%1Â : annulÃ©. %n entrÃ©e trouvÃ©e dans %2 fichiers.</numerusform>
-            <numerusform>%1Â : annulÃ©. %n entrÃ©es trouvÃ©es dans %2 fichiers.</numerusform>
+            <numerusform>%1 : annulÃ©. %n entrÃ©e trouvÃ©e dans %2 fichiers.</numerusform>
+            <numerusform>%1 : annulÃ©. %n entrÃ©es trouvÃ©es dans %2 fichiers.</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+8"/>
         <source>%1: %n occurrences found in %2 files.</source>
         <translation>
-            <numerusform>%1Â : %n occurrence trouvÃ©e dans %2 fichiers.</numerusform>
-            <numerusform>%1Â : %n occurrences trouvÃ©es dans %2 fichiers.</numerusform>
+            <numerusform>%1 : %n occurrence trouvÃ©e dans %2 fichiers.</numerusform>
+            <numerusform>%1 : %n occurrences trouvÃ©es dans %2 fichiers.</numerusform>
         </translation>
     </message>
     <message numerus="yes">
         <location line="+8"/>
         <source>%1: %n occurrences found in %2 of %3 files.</source>
         <translation>
-            <numerusform>%1Â : %n occurence trouvÃ© dans %2 de %3 fichiers.</numerusform>
-            <numerusform>%1Â : %n occurences trouvÃ©s dans %2 de %3 fichiers.</numerusform>
+            <numerusform>%1 : %n occurence trouvÃ© dans %2 de %3 fichiers.</numerusform>
+            <numerusform>%1 : %n occurences trouvÃ©s dans %2 de %3 fichiers.</numerusform>
         </translation>
     </message>
 </context>
@@ -2309,37 +2309,37 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location filename="../../../src/libs/utils/newclasswidget.ui"/>
         <source>Class name:</source>
-        <translation>Nom de la classeÂ :</translation>
+        <translation>Nom de la classe :</translation>
     </message>
     <message>
         <location/>
         <source>Base class:</source>
-        <translation>Classe parentÂ :</translation>
+        <translation>Classe parent :</translation>
     </message>
     <message>
         <location/>
         <source>Header file:</source>
-        <translation>Fichier d&apos;en-tÃªteÂ :</translation>
+        <translation>Fichier d&apos;en-tÃªte :</translation>
     </message>
     <message>
         <location/>
         <source>Source file:</source>
-        <translation>Fichier sourceÂ :</translation>
+        <translation>Fichier source :</translation>
     </message>
     <message>
         <location/>
         <source>Generate form:</source>
-        <translation>GÃ©nÃ©rer l&apos;interface graphiqueÂ :</translation>
+        <translation>GÃ©nÃ©rer l&apos;interface graphique :</translation>
     </message>
     <message>
         <location/>
         <source>Form file:</source>
-        <translation>Fichier d&apos;interfaceÂ :</translation>
+        <translation>Fichier d&apos;interface :</translation>
     </message>
     <message>
         <location/>
         <source>Path:</source>
-        <translation>CheminÂ :</translation>
+        <translation>Chemin :</translation>
     </message>
     <message>
         <location filename="../../../src/libs/utils/newclasswidget.cpp" line="+392"/>
@@ -2349,17 +2349,17 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location line="+7"/>
         <source>Invalid header file name: &apos;%1&apos;</source>
-        <translation>Nom du fichier d&apos;en-tÃªte invalideÂ : &apos;%1&apos;</translation>
+        <translation>Nom du fichier d&apos;en-tÃªte invalide : &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+6"/>
         <source>Invalid source file name: &apos;%1&apos;</source>
-        <translation>Nom du fichier source invalideÂ : &apos;%1&apos;</translation>
+        <translation>Nom du fichier source invalide : &apos;%1&apos;</translation>
     </message>
     <message>
         <location line="+7"/>
         <source>Invalid form file name: &apos;%1&apos;</source>
-        <translation>Nom du fichier d&apos;interface invalideÂ : &apos;%1&apos;</translation>
+        <translation>Nom du fichier d&apos;interface invalide : &apos;%1&apos;</translation>
     </message>
 </context>
 <context>
@@ -2407,7 +2407,7 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location line="+19"/>
         <source>Path:</source>
-        <translation>CheminÂ :</translation>
+        <translation>Chemin :</translation>
     </message>
 </context>
 <context>
@@ -2448,12 +2448,12 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location/>
         <source>Name:</source>
-        <translation>NomÂ :</translation>
+        <translation>Nom :</translation>
     </message>
     <message>
         <location/>
         <source>Create in:</source>
-        <translation>CrÃ©er dansÂ :</translation>
+        <translation>CrÃ©er dans :</translation>
     </message>
     <message>
         <location filename="../../../src/libs/utils/projectintropage.cpp" line="+65"/>
@@ -2507,12 +2507,12 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location/>
         <source>Name:</source>
-        <translation>NomÂ :</translation>
+        <translation>Nom :</translation>
     </message>
     <message>
         <location/>
         <source>Path:</source>
-        <translation>CheminÂ :</translation>
+        <translation>Chemin :</translation>
     </message>
 </context>
 <context>
@@ -2670,12 +2670,12 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location/>
         <source>Header suffix:</source>
-        <translation>Suffixe des headersÂ :</translation>
+        <translation>Suffixe des headers :</translation>
     </message>
     <message>
         <location/>
         <source>Source suffix:</source>
-        <translation>Suffixe des fichiers sourceÂ :</translation>
+        <translation>Suffixe des fichiers source :</translation>
     </message>
     <message>
         <location/>
@@ -2685,7 +2685,7 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location/>
         <source>License Template:</source>
-        <translation>ModÃ¨le de licenceÂ :</translation>
+        <translation>ModÃ¨le de licence :</translation>
     </message>
 </context>
 <context>
@@ -2693,7 +2693,7 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location filename="../../../src/plugins/cpptools/cppmodelmanager.cpp" line="+542"/>
         <source>%1: No such file or directory</source>
-        <translation>%1Â : aucun fichier ou rÃ©pertoire de ce type</translation>
+        <translation>%1 : aucun fichier ou rÃ©pertoire de ce type</translation>
     </message>
 </context>
 <context>
@@ -2765,7 +2765,7 @@ Voulez vous les Ã©craser?</translation>
         <translation type="unfinished">/**************************************************************************
 ** modÃ¨le de licence Qt Creator
 **   Mot-clÃ©s spÃ©ciaux: %USER% %DATE% %YEAR%
-**   Variables d&apos;environnementÂ : %$VARIABLE%
+**   Variables d&apos;environnement : %$VARIABLE%
 **   Pour Ã©chaper un caractÃ¨re pourcentage, utilisez &apos;%%&apos;.
 **************************************************************************/</translation>
     </message>
@@ -2791,7 +2791,7 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location line="+1"/>
         <source>Cannot write to %1: %2</source>
-        <translation type="unfinished">Impossible d&apos;Ã©crire %1Â : %2</translation>
+        <translation type="unfinished">Impossible d&apos;Ã©crire %1 : %2</translation>
     </message>
 </context>
 <context>
@@ -2803,9 +2803,9 @@ Voulez vous les Ã©craser?</translation>
     </message>
 </context>
 <context>
-    <name>CppTools::Internal::CppQuickOpenFilter</name>
+    <name>CppTools::Internal::CppLocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppquickopenfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+53"/>
         <source>Classes and Methods</source>
         <translation>Classes et mÃ©thodes</translation>
     </message>
@@ -2967,23 +2967,23 @@ Voulez vous les Ã©craser?</translation>
         <location filename="../../../src/plugins/debugger/breakhandler.cpp" line="+200"/>
         <source>Marker File:</source>
         <translatorcomment>Ã§a sonne un peu bizarre, c&apos;est pas &quot;marked file&quot;...  &quot;Fichier marqueur&quot; ou &quot;marqueur de fichier&quot; ?</translatorcomment>
-        <translation type="unfinished">Fichier marquÃ©Â :</translation>
+        <translation type="unfinished">Fichier marquÃ© :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Marker Line:</source>
         <translatorcomment>idem</translatorcomment>
-        <translation type="unfinished">Ligne marquÃ©eÂ :</translation>
+        <translation type="unfinished">Ligne marquÃ©e :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Breakpoint Number:</source>
-        <translation>NumÃ©ro du point d&apos;arrÃªtÂ :</translation>
+        <translation>NumÃ©ro du point d&apos;arrÃªt :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Breakpoint Address:</source>
-        <translation>Adresse du point d&apos;arrÃªtÂ :</translation>
+        <translation>Adresse du point d&apos;arrÃªt :</translation>
     </message>
     <message>
         <location line="+3"/>
@@ -3003,32 +3003,32 @@ Voulez vous les Ã©craser?</translation>
     <message>
         <location line="+1"/>
         <source>Internal Number:</source>
-        <translation>NumÃ©ro interneÂ :</translation>
+        <translation>NumÃ©ro interne :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>File Name:</source>
-        <translation>Nom du fichierÂ :</translation>
+        <translation>Nom du fichier :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Function Name:</source>
-        <translation>Nom de la fonctionÂ :</translation>
+        <translation>Nom de la fonction :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Line Number:</source>
-        <translation>NumÃ©ro de ligneÂ :</translation>
+        <translation>NumÃ©ro de ligne :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Condition:</source>
-        <translation>ConditionÂ :</translation>
+        <translation>Condition :</translation>
     </message>
     <message>
         <location line="+2"/>
         <source>Ignore Count:</source>
-        <translation type="unfinished">Nombre de passages Ã  ignorerÂ :</translation>
+        <translation type="unfinished">Nombre de passages Ã  ignorer :</translation>
     </message>
     <message>
         <location line="+215"/>
@@ -6150,7 +6150,7 @@ Reason: %3</source>
     <message>
         <location/>
         <source>Targets:</source>
-        <translation type="unfinished">CiblesÂ :</translation>
+        <translation type="unfinished">Cibles :</translation>
     </message>
 </context>
 <context>
@@ -6184,7 +6184,7 @@ Reason: %3</source>
     <message>
         <location line="+450"/>
         <source>Build directory:</source>
-        <translation type="unfinished">RÃ©pertoire de compilationÂ :</translation>
+        <translation type="unfinished">RÃ©pertoire de compilation :</translation>
     </message>
     <message>
         <location line="+17"/>
@@ -7292,7 +7292,7 @@ Reason: %3</source>
 <context>
     <name>Locator</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenconstants.h" line="+38"/>
+        <location filename="../../../src/plugins/locator/locatorconstants.h" line="+38"/>
         <source>Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8010,7 +8010,7 @@ in your .pro file.</source>
     <message>
         <location/>
         <source>Change:</source>
-        <translation type="unfinished">ModificationÂ :</translation>
+        <translation type="unfinished">Modification :</translation>
     </message>
     <message>
         <location/>
@@ -8329,7 +8329,7 @@ in your .pro file.</source>
     <message>
         <location line="+52"/>
         <source>File &amp;pattern:</source>
-        <translation type="unfinished">&amp;SchÃ©ma de fichierÂ :</translation>
+        <translation type="unfinished">&amp;SchÃ©ma de fichier :</translation>
     </message>
 </context>
 <context>
@@ -8476,7 +8476,7 @@ in your .pro file.</source>
     <message>
         <location line="+47"/>
         <source>File &amp;pattern:</source>
-        <translation type="unfinished">&amp;SchÃ©ma de fichierÂ :</translation>
+        <translation type="unfinished">&amp;SchÃ©ma de fichier :</translation>
     </message>
 </context>
 <context>
@@ -8499,7 +8499,7 @@ in your .pro file.</source>
     <message>
         <location line="+4"/>
         <source>Working Directory:</source>
-        <translation type="unfinished">RÃ©pertoire de travailÂ :</translation>
+        <translation type="unfinished">RÃ©pertoire de travail :</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -8539,7 +8539,7 @@ in your .pro file.</source>
     <message>
         <location line="-110"/>
         <source>Base environment for this runconfiguration:</source>
-        <translation type="unfinished">Environnement de base pour cette configuration d&apos;Ã©xecutionÂ :</translation>
+        <translation type="unfinished">Environnement de base pour cette configuration d&apos;Ã©xecution :</translation>
     </message>
 </context>
 <context>
@@ -8727,7 +8727,7 @@ in your .pro file.</source>
     <message>
         <location/>
         <source>Working Directory:</source>
-        <translation type="unfinished">RÃ©pertoire de travailÂ :</translation>
+        <translation type="unfinished">RÃ©pertoire de travail :</translation>
     </message>
     <message>
         <location/>
@@ -9347,7 +9347,7 @@ to version control (%2)?</source>
     <message>
         <location/>
         <source>Additional arguments:</source>
-        <translation type="unfinished">Arguments supplÃ©mentairesÂ :</translation>
+        <translation type="unfinished">Arguments supplÃ©mentaires :</translation>
     </message>
     <message>
         <location/>
@@ -10135,7 +10135,7 @@ to version control (%2)?</source>
     <message>
         <location line="+7"/>
         <source>Working Directory:</source>
-        <translation type="unfinished">RÃ©pertoire de travailÂ :</translation>
+        <translation type="unfinished">RÃ©pertoire de travail :</translation>
     </message>
     <message>
         <location line="+12"/>
@@ -10145,7 +10145,7 @@ to version control (%2)?</source>
     <message>
         <location line="+18"/>
         <source>Base environment for this runconfiguration:</source>
-        <translation type="unfinished">Environnement de base pour cette configuration d&apos;Ã©xecutionÂ :</translation>
+        <translation type="unfinished">Environnement de base pour cette configuration d&apos;Ã©xecution :</translation>
     </message>
 </context>
 <context>
@@ -10748,9 +10748,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::IQuickOpenFilter</name>
+    <name>Locator::ILocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/iquickopenfilter.cpp" line="+86"/>
+        <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
         <source>Filter Configuration</source>
         <translation type="unfinished">Configuration du filtre</translation>
     </message>
@@ -10766,9 +10766,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilter</name>
+    <name>Locator::Internal::DirectoryFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.cpp" line="+44"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
         <source>Generic Directory Filter</source>
         <translation type="unfinished">Filtre de dossier gÃ©nÃ©rique</translation>
     </message>
@@ -10803,9 +10803,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilterOptions</name>
+    <name>Locator::Internal::DirectoryFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.ui"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
         <source>Name:</source>
         <translation type="unfinished">Nom:</translation>
     </message>
@@ -10857,17 +10857,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilter</name>
+    <name>Locator::Internal::FileSystemFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.h" line="+54"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
         <source>Files in file system</source>
         <translation type="unfinished">Fichiers du systÃ¨me de fichier</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilterOptions</name>
+    <name>Locator::Internal::FileSystemFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.ui"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
         <source>Filter configuration</source>
         <translation type="unfinished">Configuration du filtre</translation>
     </message>
@@ -10893,33 +10893,33 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::OpenDocumentsFilter</name>
+    <name>Locator::Internal::OpenDocumentsFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/opendocumentsfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
         <source>Open documents</source>
         <translation type="unfinished">Ouvrir des documents</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenFiltersFilter</name>
+    <name>Locator::Internal::LocatorFiltersFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenfiltersfilter.cpp" line="+53"/>
+        <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
         <source>Available filters</source>
         <translation type="unfinished">Filtres disponibles</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenPlugin</name>
+    <name>Locator::Internal::LocatorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenplugin.cpp" line="+247"/>
+        <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+247"/>
         <source>Indexing</source>
         <translation type="unfinished">Indexation</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenToolWindow</name>
+    <name>Locator::Internal::LocatorWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopentoolwindow.cpp" line="+254"/>
+        <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
         <source>Refresh</source>
         <translation type="unfinished">RaffraÃ®chir</translation>
     </message>
@@ -10945,9 +10945,9 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsDialog</name>
+    <name>Locator::Internal::SettingsDialog</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingswidget.ui"/>
+        <location filename="../../../src/plugins/locator/settingswidget.ui"/>
         <source>Configure Filters</source>
         <translation type="unfinished">Configurer les filtres</translation>
     </message>
@@ -10983,17 +10983,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsPage</name>
+    <name>Locator::Internal::SettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.cpp" line="+159"/>
+        <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
         <source>%1 (Prefix: %2)</source>
         <translation type="unfinished">%1 (Prefixe: %2)</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsWidget</name>
+    <name>Locator::Internal::SettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.ui"/>
+        <location filename="../../../src/plugins/locator/settingspage.ui"/>
         <source>Configure Filters</source>
         <translation type="unfinished">Configurer les filtres</translation>
     </message>
@@ -11460,12 +11460,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location/>
         <source>Use server start script:</source>
-        <translation type="unfinished">Utiliser le script de dÃ©marrage du serveurÂ :</translation>
+        <translation type="unfinished">Utiliser le script de dÃ©marrage du serveur :</translation>
     </message>
     <message>
         <location/>
         <source>Server start script:</source>
-        <translation type="unfinished">Script de dÃ©marrage du serveurÂ :</translation>
+        <translation type="unfinished">Script de dÃ©marrage du serveur :</translation>
     </message>
 </context>
 <context>
@@ -11695,7 +11695,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location line="+8"/>
         <source>Cannot create temporary file: %1</source>
-        <translation type="unfinished">Impossible de crÃ©er le fichier temporaireÂ : %1</translation>
+        <translation type="unfinished">Impossible de crÃ©er le fichier temporaire : %1</translation>
     </message>
     <message>
         <location line="+186"/>
@@ -11705,7 +11705,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location line="+1"/>
         <source>Revision number:</source>
-        <translation type="unfinished">NumÃ©ro de rÃ©visionÂ :</translation>
+        <translation type="unfinished">NumÃ©ro de rÃ©vision :</translation>
     </message>
     <message>
         <location line="+47"/>
@@ -11723,7 +11723,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <source>%1 Executing: %2 %3
 </source>
         <extracomment>&lt;timestamp&gt; Executing: &lt;executable&gt; &lt;arguments&gt;</extracomment>
-        <translation type="obsolete">%1 ExÃ©cution deÂ : %2 %3</translation>
+        <translation type="obsolete">%1 ExÃ©cution de : %2 %3</translation>
     </message>
     <message>
         <location line="+29"/>
@@ -11799,7 +11799,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <location line="+290"/>
         <source>&lt;b&gt;Error:&lt;/b&gt; Could not decode &quot;%1&quot; with &quot;%2&quot;-encoding. Editing not possible.</source>
         <translatorcomment>error -&gt; erreur ;)</translatorcomment>
-        <translation type="unfinished">&lt;b&gt;ErreurÂ :&lt;/b&gt; Impossible de dÃ©coder &quot;%1&quot; avec l&apos;encodage &quot;%2&quot;. L&apos;Ã©dition est impossible.</translation>
+        <translation type="unfinished">&lt;b&gt;Erreur :&lt;/b&gt; Impossible de dÃ©coder &quot;%1&quot; avec l&apos;encodage &quot;%2&quot;. L&apos;Ã©dition est impossible.</translation>
     </message>
     <message>
         <location line="+2"/>
@@ -11812,12 +11812,12 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location line="+4283"/>
         <source>Line: %1, Col: %2</source>
-        <translation>LigneÂ : %1, ColÂ : %2</translation>
+        <translation>Ligne : %1, Col : %2</translation>
     </message>
     <message>
         <location line="+1"/>
         <source>Line: %1, Col: 999</source>
-        <translation>LigneÂ : %1, ColÂ : 999</translation>
+        <translation>Ligne : %1, Col : 999</translation>
     </message>
 </context>
 <context>
@@ -11850,17 +11850,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location/>
         <source>Ta&amp;b size:</source>
-        <translation>Taille de &amp;tabulationÂ :</translation>
+        <translation>Taille de &amp;tabulation :</translation>
     </message>
     <message>
         <location/>
         <source>&amp;Indent size:</source>
-        <translation>Taille de l&apos;in&amp;dentationÂ :</translation>
+        <translation>Taille de l&apos;in&amp;dentation :</translation>
     </message>
     <message>
         <location/>
         <source>Tab key performs auto-indent:</source>
-        <translation>La touche tabulation active l&apos;identation automatiqueÂ :</translation>
+        <translation>La touche tabulation active l&apos;identation automatique :</translation>
     </message>
     <message>
         <location/>
@@ -11973,7 +11973,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location/>
         <source>Display right &amp;margin at column:</source>
-        <translation>Afficher une &amp;marge Ã  la colonneÂ :</translation>
+        <translation>Afficher une &amp;marge Ã  la colonne :</translation>
     </message>
     <message>
         <location/>
@@ -12045,7 +12045,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
     <message>
         <source>
-	This is only an example.</source>
+        This is only an example.</source>
         <translation type="obsolete">\n\tCeci est seulement un exemple.</translation>
     </message>
 </context>
@@ -12060,7 +12060,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
         <location line="+4"/>
         <source>
 The following encodings are likely to fit:</source>
-        <translation type="unfinished">Les encodages suivants pourraient convenirÂ :</translation>
+        <translation type="unfinished">Les encodages suivants pourraient convenir :</translation>
     </message>
     <message>
         <location line="+1"/>
@@ -12096,7 +12096,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+37"/>
         <source>&amp;Directory:</source>
-        <translation>&amp;DossierÂ :</translation>
+        <translation>&amp;Dossier :</translation>
     </message>
     <message>
         <location line="+13"/>
@@ -12107,7 +12107,7 @@ The following encodings are likely to fit:</source>
         <location line="+4"/>
         <source>File &amp;pattern:</source>
         <translatorcomment>SchÃ©ma ou motif ? (motif Ã§a fait penser au style du mÃªme nom...)</translatorcomment>
-        <translation type="unfinished">&amp;SchÃ©ma de fichierÂ :</translation>
+        <translation type="unfinished">&amp;SchÃ©ma de fichier :</translation>
     </message>
     <message>
         <location line="+18"/>
@@ -12125,12 +12125,12 @@ The following encodings are likely to fit:</source>
     <message>
         <location/>
         <source>Family:</source>
-        <translation>FamilleÂ :</translation>
+        <translation>Famille :</translation>
     </message>
     <message>
         <location/>
         <source>Size:</source>
-        <translation>TailleÂ :</translation>
+        <translation>Taille :</translation>
     </message>
     <message>
         <location/>
@@ -12153,11 +12153,11 @@ The following encodings are likely to fit:</source>
     </message>
     <message>
         <source>Background:</source>
-        <translation type="obsolete">ArriÃ¨re planÂ :</translation>
+        <translation type="obsolete">ArriÃ¨re plan :</translation>
     </message>
     <message>
         <source>Foreground:</source>
-        <translation type="obsolete">Premier planÂ :</translation>
+        <translation type="obsolete">Premier plan :</translation>
     </message>
     <message>
         <source>Erase background</source>
@@ -12165,7 +12165,7 @@ The following encodings are likely to fit:</source>
     </message>
     <message>
         <source>Preview:</source>
-        <translation type="obsolete">AperÃ§uÂ :</translation>
+        <translation type="obsolete">AperÃ§u :</translation>
     </message>
     <message>
         <location/>
@@ -12721,7 +12721,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location filename="../../../src/shared/help/topicchooser.cpp" line="+42"/>
         <source>Choose a topic for &lt;b&gt;%1&lt;/b&gt;:</source>
-        <translation type="unfinished">Choisissez un thÃ¨me pour &lt;b&gt;%1&lt;/b&gt;Â :</translation>
+        <translation type="unfinished">Choisissez un thÃ¨me pour &lt;b&gt;%1&lt;/b&gt; :</translation>
     </message>
 </context>
 <context>
@@ -12764,7 +12764,7 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+15"/>
         <source>Cannot open &apos;%1&apos;: %2</source>
-        <translation>Impossible d&apos;ouvrir &apos;%1&apos;Â : %2</translation>
+        <translation>Impossible d&apos;ouvrir &apos;%1&apos; : %2</translation>
     </message>
 </context>
 <context>
@@ -12813,17 +12813,17 @@ The following encodings are likely to fit:</source>
     <message>
         <location line="+28"/>
         <source>Unable to open &apos;%1&apos;: %2</source>
-        <translation>Impossible d&apos;ouvrir &apos;%1&apos;Â : %2</translation>
+        <translation>Impossible d&apos;ouvrir &apos;%1&apos; : %2</translation>
     </message>
     <message>
         <location line="+10"/>
         <source>The check script &apos;%1&apos; could not be started: %2</source>
-        <translation>Le script de vÃ©rification &apos;%1&apos; ne peut pas Ãªtre dÃ©marrÃ©Â : %2</translation>
+        <translation>Le script de vÃ©rification &apos;%1&apos; ne peut pas Ãªtre dÃ©marrÃ© : %2</translation>
     </message>
     <message>
         <location line="+4"/>
         <source>The check script &apos;%1&apos; could not be run: %2</source>
-        <translation>Le script de vÃ©rification &apos;%1&apos; ne peut pas Ãªtre exÃ©cutÃ©Â : %2</translation>
+        <translation>Le script de vÃ©rification &apos;%1&apos; ne peut pas Ãªtre exÃ©cutÃ© : %2</translation>
     </message>
     <message>
         <location line="+7"/>
@@ -12841,29 +12841,29 @@ The following encodings are likely to fit:</source>
     <message>
         <location/>
         <source>Wrap submit message at:</source>
-        <translation>Limiter la largeur du message Ã Â :</translation>
+        <translation>Limiter la largeur du message Ã  :</translation>
     </message>
     <message>
         <location/>
         <source>An executable which is called with the submit message in a temporary file as first argument. It should return with an exit != 0 and a message on standard error to indicate failure.</source>
-        <translation type="unfinished">Un fichier exÃ©cutable qui est appelÃ© avec comme premier argument le message dans un fichier temporaire. Pour indiquer une erreur, il doit se terminer avec un codeÂ != 0 et un message sur la sortie d&apos;erreur standard.</translation>
+        <translation type="unfinished">Un fichier exÃ©cutable qui est appelÃ© avec comme premier argument le message dans un fichier temporaire. Pour indiquer une erreur, il doit se terminer avec un code != 0 et un message sur la sortie d&apos;erreur standard.</translation>
     </message>
     <message>
         <location/>
         <source>Submit message check script:</source>
-        <translation>Script de vÃ©rification du messageÂ :</translation>
+        <translation>Script de vÃ©rification du message :</translation>
     </message>
     <message>
         <location/>
         <source>A file listing user names and email addresses in a 4-column mailmap format:
 name &lt;email&gt; alias &lt;email&gt;</source>
-        <translation type="unfinished">Un fichier listant les noms d&apos;utilisateur et leur adresse email dans le format 4 colonnes de mailmapÂ :
+        <translation type="unfinished">Un fichier listant les noms d&apos;utilisateur et leur adresse email dans le format 4 colonnes de mailmap :
 nom &lt;email&gt; alias &lt;/email&gt;</translation>
     </message>
     <message>
         <location/>
         <source>User/alias configuration file:</source>
-        <translation>Fichier de configuration des alias utilisateurÂ :</translation>
+        <translation>Fichier de configuration des alias utilisateur :</translation>
     </message>
     <message>
         <location/>
@@ -12873,7 +12873,7 @@ nom &lt;email&gt; alias &lt;/email&gt;</translation>
     <message>
         <location/>
         <source>User fields configuration file:</source>
-        <translation>Fichier de configuration des champs utilisateursÂ :</translation>
+        <translation>Fichier de configuration des champs utilisateurs :</translation>
     </message>
 </context>
 <context>
@@ -12888,7 +12888,7 @@ nom &lt;email&gt; alias &lt;/email&gt;</translation>
         <source>Would you like to remove this file from the version control system (%1)?
 Note: This might remove the local file.</source>
         <translation type="unfinished">Voulez-vous retirer ce fichier du systÃ¨me de gestion de versions (%1)?
-NoteÂ : Ceci risque de supprimer le fichier du disque.</translation>
+Note : Ceci risque de supprimer le fichier du disque.</translation>
     </message>
 </context>
 <context>
@@ -12920,7 +12920,7 @@ NoteÂ : Ceci risque de supprimer le fichier du disque.</translation>
     <message>
         <location/>
         <source>&amp;Username:</source>
-        <translation>&amp;UtilisateurÂ :</translation>
+        <translation>&amp;Utilisateur :</translation>
     </message>
     <message>
         <location/>
@@ -12930,7 +12930,7 @@ NoteÂ : Ceci risque de supprimer le fichier du disque.</translation>
     <message>
         <location/>
         <source>&amp;Description:</source>
-        <translation type="unfinished">&amp;DescriptionÂ :</translation>
+        <translation type="unfinished">&amp;Description :</translation>
     </message>
     <message>
         <location/>
@@ -13300,7 +13300,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location/>
         <source>Family:</source>
-        <translation type="unfinished">FamilleÂ :</translation>
+        <translation type="unfinished">Famille :</translation>
     </message>
     <message>
         <location/>
@@ -13310,7 +13310,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location/>
         <source>Size:</source>
-        <translation type="unfinished">TailleÂ :</translation>
+        <translation type="unfinished">Taille :</translation>
     </message>
     <message>
         <location/>
@@ -13888,12 +13888,12 @@ p, li { white-space: pre-wrap; }
     <message>
         <location/>
         <source>Background:</source>
-        <translation type="unfinished">ArriÃ¨re planÂ :</translation>
+        <translation type="unfinished">ArriÃ¨re plan :</translation>
     </message>
     <message>
         <location/>
         <source>Foreground:</source>
-        <translation type="unfinished">Premier planÂ :</translation>
+        <translation type="unfinished">Premier plan :</translation>
     </message>
     <message>
         <location/>
@@ -13921,7 +13921,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location/>
         <source>Path:</source>
-        <translation type="unfinished">CheminÂ :</translation>
+        <translation type="unfinished">Chemin :</translation>
     </message>
 </context>
 <context>
diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts
index eeb8515325223205bcee6529efb98c89613bd297..9448a8bbabf098461a9420459df505f421e510a9 100644
--- a/share/qtcreator/translations/qtcreator_it.ts
+++ b/share/qtcreator/translations/qtcreator_it.ts
@@ -2803,9 +2803,9 @@ Vuoi sovrascriverli?</translation>
     </message>
 </context>
 <context>
-    <name>CppTools::Internal::CppQuickOpenFilter</name>
+    <name>CppTools::Internal::CppLocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppquickopenfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+53"/>
         <source>Classes and Methods</source>
         <translation>Classi e Metodi</translation>
     </message>
@@ -7760,7 +7760,7 @@ Causa: %3</translation>
 <context>
     <name>Locator</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenconstants.h" line="+38"/>
+        <location filename="../../../src/plugins/locator/locatorconstants.h" line="+38"/>
         <source>Filters</source>
         <translation>Filtri</translation>
     </message>
@@ -11551,9 +11551,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::IQuickOpenFilter</name>
+    <name>Locator::ILocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/iquickopenfilter.cpp" line="+86"/>
+        <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
         <source>Filter Configuration</source>
         <translation>Configurazione del Filtro</translation>
     </message>
@@ -11569,9 +11569,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilter</name>
+    <name>Locator::Internal::DirectoryFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.cpp" line="+44"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
         <source>Generic Directory Filter</source>
         <translation>Filtro Cartella Generica</translation>
     </message>
@@ -11606,9 +11606,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilterOptions</name>
+    <name>Locator::Internal::DirectoryFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.ui"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
         <source>Name:</source>
         <translation>Nome:</translation>
     </message>
@@ -11661,17 +11661,17 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilter</name>
+    <name>Locator::Internal::FileSystemFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.h" line="+54"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
         <source>Files in file system</source>
         <translation>File nel file system</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilterOptions</name>
+    <name>Locator::Internal::FileSystemFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.ui"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
         <source>Filter configuration</source>
         <translation>Configurazione del filtro</translation>
     </message>
@@ -11697,33 +11697,33 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::OpenDocumentsFilter</name>
+    <name>Locator::Internal::OpenDocumentsFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/opendocumentsfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
         <source>Open documents</source>
         <translation>Documenti aperti</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenFiltersFilter</name>
+    <name>Locator::Internal::LocatorFiltersFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenfiltersfilter.cpp" line="+53"/>
+        <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
         <source>Available filters</source>
         <translation>Filtri disponibili</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenPlugin</name>
+    <name>Locator::Internal::LocatorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenplugin.cpp" line="+247"/>
+        <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+247"/>
         <source>Indexing</source>
         <translation>Indicizzazione</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenToolWindow</name>
+    <name>Locator::Internal::LocatorWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopentoolwindow.cpp" line="+254"/>
+        <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
         <source>Refresh</source>
         <translation>Aggiorna</translation>
     </message>
@@ -11749,9 +11749,9 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsDialog</name>
+    <name>Locator::Internal::SettingsDialog</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingswidget.ui"/>
+        <location filename="../../../src/plugins/locator/settingswidget.ui"/>
         <source>Configure Filters</source>
         <translation>Configura i Filtri</translation>
     </message>
@@ -11787,17 +11787,17 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsPage</name>
+    <name>Locator::Internal::SettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.cpp" line="+159"/>
+        <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
         <source>%1 (Prefix: %2)</source>
         <translation>%1 (Prefisso: %2)</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsWidget</name>
+    <name>Locator::Internal::SettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.ui"/>
+        <location filename="../../../src/plugins/locator/settingspage.ui"/>
         <source>Configure Filters</source>
         <translation>Configura i Filtri</translation>
     </message>
@@ -12850,9 +12850,9 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da
     </message>
     <message>
         <source>
-	This is only an example.</source>
+        This is only an example.</source>
         <translation type="obsolete">
-	Questo Ã¨ solo un esempio.</translation>
+        Questo Ã¨ solo un esempio.</translation>
     </message>
 </context>
 <context>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 1da4219aac800b23690737330998b1b8427bb460..504eecda75487ef1d847ca8193ca5d10dcc5afa6 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -2811,9 +2811,9 @@ Would you like to overwrite them?</source>
     </message>
 </context>
 <context>
-    <name>CppTools::Internal::CppQuickOpenFilter</name>
+    <name>CppTools::Internal::CppLocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppquickopenfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+53"/>
         <source>Classes and Methods</source>
         <translation>ã‚¯ãƒ©ã‚¹ã¨ãƒ¡ã‚½ãƒƒãƒ‰</translation>
     </message>
@@ -7764,7 +7764,7 @@ Reason: %3</source>
 <context>
     <name>Locator</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenconstants.h" line="+38"/>
+        <location filename="../../../src/plugins/locator/locatorconstants.h" line="+38"/>
         <source>Filters</source>
         <translation>ãƒ•ã‚£ãƒ«ã‚¿</translation>
     </message>
@@ -11555,9 +11555,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::IQuickOpenFilter</name>
+    <name>Locator::ILocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/iquickopenfilter.cpp" line="+86"/>
+        <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
         <source>Filter Configuration</source>
         <translation>ãƒ•ã‚£ãƒ«ã‚¿è¨å®š</translation>
     </message>
@@ -11573,9 +11573,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilter</name>
+    <name>Locator::Internal::DirectoryFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.cpp" line="+44"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
         <source>Generic Directory Filter</source>
         <translation>é€šå¸¸ã®ãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª ãƒ•ã‚£ãƒ«ã‚¿</translation>
     </message>
@@ -11609,9 +11609,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilterOptions</name>
+    <name>Locator::Internal::DirectoryFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.ui"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
         <source>Name:</source>
         <translation>åå‰:</translation>
     </message>
@@ -11664,17 +11664,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilter</name>
+    <name>Locator::Internal::FileSystemFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.h" line="+54"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
         <source>Files in file system</source>
         <translation>ãƒ•ã‚¡ã‚¤ãƒ« ã‚·ã‚¹ãƒ†ãƒ ä¸Šã®ãƒ•ã‚¡ã‚¤ãƒ«</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilterOptions</name>
+    <name>Locator::Internal::FileSystemFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.ui"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
         <source>Filter configuration</source>
         <translation>ãƒ•ã‚£ãƒ«ã‚¿è¨å®š</translation>
     </message>
@@ -11700,33 +11700,33 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::OpenDocumentsFilter</name>
+    <name>Locator::Internal::OpenDocumentsFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/opendocumentsfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
         <source>Open documents</source>
         <translation>ãƒ‰ã‚ãƒ¥ãƒ¡ãƒ³ãƒˆã‚’é–‹ã</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenFiltersFilter</name>
+    <name>Locator::Internal::LocatorFiltersFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenfiltersfilter.cpp" line="+53"/>
+        <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
         <source>Available filters</source>
         <translation>ä½¿ç”¨å¯èƒ½ãªãƒ•ã‚£ãƒ«ã‚¿</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenPlugin</name>
+    <name>Locator::Internal::LocatorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenplugin.cpp" line="+247"/>
+        <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+247"/>
         <source>Indexing</source>
         <translation>è§£æžä¸</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenToolWindow</name>
+    <name>Locator::Internal::LocatorWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopentoolwindow.cpp" line="+254"/>
+        <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
         <source>Refresh</source>
         <translation>æ›´æ–°</translation>
     </message>
@@ -11752,9 +11752,9 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsDialog</name>
+    <name>Locator::Internal::SettingsDialog</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingswidget.ui"/>
+        <location filename="../../../src/plugins/locator/settingswidget.ui"/>
         <source>Configure Filters</source>
         <translation>ãƒ•ã‚£ãƒ«ã‚¿è¨å®š</translation>
     </message>
@@ -11790,17 +11790,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsPage</name>
+    <name>Locator::Internal::SettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.cpp" line="+159"/>
+        <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
         <source>%1 (Prefix: %2)</source>
         <translation>%1 (ãƒ—ãƒ¬ãƒ•ã‚£ã‚¯ã‚¹: %2)</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsWidget</name>
+    <name>Locator::Internal::SettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.ui"/>
+        <location filename="../../../src/plugins/locator/settingspage.ui"/>
         <source>Configure Filters</source>
         <translation>ãƒ•ã‚£ãƒ«ã‚¿è¨å®š</translation>
     </message>
@@ -12853,9 +12853,9 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
     <message>
         <source>
-	This is only an example.</source>
+        This is only an example.</source>
         <translation type="obsolete">
-	This is only an example.</translation>
+        This is only an example.</translation>
     </message>
 </context>
 <context>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index 2f2b7e8035af0a9634a009fac7ff0ff2f1959ee3..1f45682dd441f11a7ef9a4619394be01189856bd 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -2769,9 +2769,9 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilterOptions</name>
+    <name>Locator::Internal::DirectoryFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.ui"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
         <source>Name:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2823,9 +2823,9 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilterOptions</name>
+    <name>Locator::Internal::FileSystemFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.ui"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
         <source>Filter configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2851,9 +2851,9 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsWidget</name>
+    <name>Locator::Internal::SettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.ui"/>
+        <location filename="../../../src/plugins/locator/settingspage.ui"/>
         <source>Configure Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -2884,9 +2884,9 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsDialog</name>
+    <name>Locator::Internal::SettingsDialog</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingswidget.ui"/>
+        <location filename="../../../src/plugins/locator/settingswidget.ui"/>
         <source>Configure Filters</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5901,9 +5901,9 @@ Note: This might remove the local file.</source>
     </message>
 </context>
 <context>
-    <name>CppTools::Internal::CppQuickOpenFilter</name>
+    <name>CppTools::Internal::CppLocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppquickopenfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+53"/>
         <source>Classes and Methods</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13421,9 +13421,9 @@ Check if the phone is connected and the TRK application is running.</source>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilter</name>
+    <name>Locator::Internal::DirectoryFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.cpp" line="+44"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
         <source>Generic Directory Filter</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13457,17 +13457,17 @@ Check if the phone is connected and the TRK application is running.</source>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilter</name>
+    <name>Locator::Internal::FileSystemFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.h" line="+54"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
         <source>Files in file system</source>
         <translation>Pliki w systemie plikÃ³w</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::IQuickOpenFilter</name>
+    <name>Locator::ILocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/iquickopenfilter.cpp" line="+86"/>
+        <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
         <source>Filter Configuration</source>
         <translation>Konfiguracja filtra</translation>
     </message>
@@ -13483,9 +13483,9 @@ Check if the phone is connected and the TRK application is running.</source>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::OpenDocumentsFilter</name>
+    <name>Locator::Internal::OpenDocumentsFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/opendocumentsfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
         <source>Open documents</source>
         <translation>Otwarte dokumenty</translation>
     </message>
@@ -13493,7 +13493,7 @@ Check if the phone is connected and the TRK application is running.</source>
 <context>
     <name>Locator</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenconstants.h" line="+38"/>
+        <location filename="../../../src/plugins/locator/locatorconstants.h" line="+38"/>
         <source>Filters</source>
         <translation>Filtry</translation>
     </message>
@@ -13504,25 +13504,25 @@ Check if the phone is connected and the TRK application is running.</source>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenFiltersFilter</name>
+    <name>Locator::Internal::LocatorFiltersFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenfiltersfilter.cpp" line="+53"/>
+        <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
         <source>Available filters</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenPlugin</name>
+    <name>Locator::Internal::LocatorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenplugin.cpp" line="+247"/>
+        <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+247"/>
         <source>Indexing</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenToolWindow</name>
+    <name>Locator::Internal::LocatorWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopentoolwindow.cpp" line="+254"/>
+        <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
         <source>Refresh</source>
         <translation type="unfinished"></translation>
     </message>
@@ -13548,9 +13548,9 @@ Check if the phone is connected and the TRK application is running.</source>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsPage</name>
+    <name>Locator::Internal::SettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.cpp" line="+159"/>
+        <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
         <source>%1 (Prefix: %2)</source>
         <translation>%1 (Przedrostek: %2)</translation>
     </message>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index fcd83e541aad4b01855fe1dea32fb38eecb7b679..f142b4edb8926b3c9fe107789ce662283b44c6e4 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -2973,9 +2973,9 @@ Would you like to overwrite them?</source>
     </message>
 </context>
 <context>
-    <name>CppTools::Internal::CppQuickOpenFilter</name>
+    <name>CppTools::Internal::CppLocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/cpptools/cppquickopenfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/cpptools/cpplocatorfilter.h" line="+53"/>
         <source>Classes and Methods</source>
         <translation>ÐšÐ»Ð°ÑÑÑ‹ Ð¸ Ð¼ÐµÑ‚Ð¾Ð´Ñ‹</translation>
     </message>
@@ -8207,7 +8207,7 @@ Perl Ñ‡ÐµÑ€ÐµÐ· Ð¿ÐµÑ€ÐµÐ¼ÐµÐ½Ð½Ñ‹Ðµ ÑÑ€ÐµÐ´Ñ‹ Ð¾ÐºÑ€ÑƒÐ¶ÐµÐ½Ð¸Ñ.</translation
 <context>
     <name>Locator</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenconstants.h" line="+38"/>
+        <location filename="../../../src/plugins/locator/locatorconstants.h" line="+38"/>
         <source>Filters</source>
         <translation>Ð¤Ð¸Ð»ÑŒÑ‚Ñ€Ñ‹</translation>
     </message>
@@ -13249,9 +13249,9 @@ Check if the phone is connected and the TRK application is running.</source>
     </message>
 </context>
 <context>
-    <name>QuickOpen::IQuickOpenFilter</name>
+    <name>Locator::ILocatorFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/iquickopenfilter.cpp" line="+86"/>
+        <location filename="../../../src/plugins/locator/ilocatorfilter.cpp" line="+86"/>
         <source>Filter Configuration</source>
         <translation type="unfinished">ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°</translation>
     </message>
@@ -13267,9 +13267,9 @@ Check if the phone is connected and the TRK application is running.</source>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilter</name>
+    <name>Locator::Internal::DirectoryFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.cpp" line="+44"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.cpp" line="+44"/>
         <source>Generic Directory Filter</source>
         <translation>Ð‘Ð°Ð·Ð¾Ð²Ñ‹Ð¹ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³Ð¾Ð²</translation>
     </message>
@@ -13305,9 +13305,9 @@ Check if the phone is connected and the TRK application is running.</source>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::DirectoryFilterOptions</name>
+    <name>Locator::Internal::DirectoryFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/directoryfilter.ui"/>
+        <location filename="../../../src/plugins/locator/directoryfilter.ui"/>
         <source>Name:</source>
         <translation>ÐÐ°Ð·Ð²Ð°Ð½Ð¸Ðµ:</translation>
     </message>
@@ -13360,17 +13360,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilter</name>
+    <name>Locator::Internal::FileSystemFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.h" line="+54"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.h" line="+54"/>
         <source>Files in file system</source>
         <translation>Ð¤Ð°Ð¹Ð»Ñ‹ Ð² ÑÐ¸ÑÑ‚ÐµÐ¼Ðµ</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::FileSystemFilterOptions</name>
+    <name>Locator::Internal::FileSystemFilterOptions</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/filesystemfilter.ui"/>
+        <location filename="../../../src/plugins/locator/filesystemfilter.ui"/>
         <source>Filter configuration</source>
         <translation>ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°</translation>
     </message>
@@ -13396,33 +13396,33 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::OpenDocumentsFilter</name>
+    <name>Locator::Internal::OpenDocumentsFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/opendocumentsfilter.h" line="+53"/>
+        <location filename="../../../src/plugins/locator/opendocumentsfilter.h" line="+53"/>
         <source>Open documents</source>
         <translation>ÐžÑ‚ÐºÑ€Ñ‹Ñ‚Ñ‹Ðµ Ð´Ð¾ÐºÑƒÐ¼ÐµÐ½Ñ‚Ñ‹</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenFiltersFilter</name>
+    <name>Locator::Internal::LocatorFiltersFilter</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenfiltersfilter.cpp" line="+53"/>
+        <location filename="../../../src/plugins/locator/locatorfiltersfilter.cpp" line="+53"/>
         <source>Available filters</source>
         <translation type="unfinished">Ð”Ð¾ÑÑ‚ÑƒÐ¿Ð½Ñ‹Ðµ Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ñ‹</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenPlugin</name>
+    <name>Locator::Internal::LocatorPlugin</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopenplugin.cpp" line="+247"/>
+        <location filename="../../../src/plugins/locator/locatorplugin.cpp" line="+247"/>
         <source>Indexing</source>
         <translation>Ð˜Ð½Ð´ÐµÐºÑÐ°Ñ†Ð¸Ñ</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::QuickOpenToolWindow</name>
+    <name>Locator::Internal::LocatorWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/quickopentoolwindow.cpp" line="+254"/>
+        <location filename="../../../src/plugins/locator/locatorwidget.cpp" line="+254"/>
         <source>Refresh</source>
         <translation>ÐžÐ±Ð½Ð¾Ð²Ð¸Ñ‚ÑŒ</translation>
     </message>
@@ -13448,9 +13448,9 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsDialog</name>
+    <name>Locator::Internal::SettingsDialog</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingswidget.ui"/>
+        <location filename="../../../src/plugins/locator/settingswidget.ui"/>
         <source>Configure Filters</source>
         <translation>ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð²</translation>
     </message>
@@ -13486,17 +13486,17 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsPage</name>
+    <name>Locator::Internal::SettingsPage</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.cpp" line="+159"/>
+        <location filename="../../../src/plugins/locator/settingspage.cpp" line="+159"/>
         <source>%1 (Prefix: %2)</source>
         <translation>%1 (Ð¿Ñ€ÐµÑ„Ð¸ÐºÑ: %2)</translation>
     </message>
 </context>
 <context>
-    <name>QuickOpen::Internal::SettingsWidget</name>
+    <name>Locator::Internal::SettingsWidget</name>
     <message>
-        <location filename="../../../src/plugins/quickopen/settingspage.ui"/>
+        <location filename="../../../src/plugins/locator/settingspage.ui"/>
         <source>Configure Filters</source>
         <translation>ÐÐ°ÑÑ‚Ñ€Ð¾Ð¹ÐºÐ° Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð¾Ð²</translation>
     </message>
@@ -13681,7 +13681,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
     <message>
         <location/>
         <source>Automatically save all files before building</source>
-        <translation>ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ ÑÐ¾Ñ…Ñ€Ð°Ð½ÑÑ‚ÑŒ Ð²ÑÐµ 
+        <translation>ÐÐ²Ñ‚Ð¾Ð¼Ð°Ñ‚Ð¸Ñ‡ÐµÑÐºÐ¸ ÑÐ¾Ñ…Ñ€Ð°Ð½ÑÑ‚ÑŒ Ð²ÑÐµ
 Ñ„Ð°Ð¹Ð»Ñ‹ Ð¿ÐµÑ€ÐµÐ´ ÑÐ±Ð¾Ñ€ÐºÐ¾Ð¹</translation>
     </message>
 </context>