Qnx: Move to Tr::tr

Change-Id: I43b49d325a129c180869140c4ae1774f7f89d2fd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

share/qtcreator/translations/qtcreator_da.ts

@@ -34175,14 +34175,14 @@ Vil du gemme dataene først?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxAttachDebugSupport</name>
+    <name>Qnx</name>
     <message>
         <source>Remote QNX process %1</source>
         <translation>Fjern-QNX-proces %1</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxConfiguration</name>
+    <name>Qnx</name>
     <message>
         <source>The following errors occurred while activating the QNX configuration:</source>
         <translation>Følgende fejl opstod ved aktivering af QNX-konfigurationen:</translation>
@@ -34213,11 +34213,7 @@ Vil du gemme dataene først?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDebugSupport</name>
+    <name>Qnx</name>
-    <message>
-        <source>Preparing remote side...</source>
-        <translation>Forbereder fjern-side...</translation>
-    </message>
     <message>
         <source>Project source directory:</source>
         <translation>Projekt kildemappe:</translation>
@@ -34228,7 +34224,7 @@ Vil du gemme dataene først?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeployQtLibrariesDialog</name>
+    <name>Qnx</name>
     <message>
         <source>Qt library to deploy:</source>
         <translation>Qt-bibliotek som skal udsendes:</translation>
@@ -34279,7 +34275,7 @@ Er du sikker på, at du vil fortsætte?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDevice</name>
+    <name>Qnx</name>
     <message>
         <source>QNX</source>
         <translation>QNX</translation>
@@ -34290,14 +34286,14 @@ Er du sikker på, at du vil fortsætte?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeviceFactory</name>
+    <name>Qnx</name>
     <message>
         <source>QNX Device</source>
         <translation>QNX-enhed</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeviceTester</name>
+    <name>Qnx</name>
     <message>
         <source>%1 found.</source>
         <translation>%1 fundet.</translation>
@@ -34320,32 +34316,28 @@ Er du sikker på, at du vil fortsætte?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeviceWizard</name>
+    <name>Qnx</name>
-    <message>
-        <source>QNX Device</source>
-        <translation>QNX-enhed</translation>
-    </message>
     <message>
         <source>New QNX Device Configuration Setup</source>
         <translation>Ny QNX-enhed konfigurationsopsætning</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxPlugin</name>
+    <name>Qnx</name>
     <message>
         <source>Attach to remote QNX application...</source>
         <translation>Tilkobl til fjern-QNX-program...</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxQmlProfilerSupport</name>
+    <name>Qnx</name>
     <message>
         <source>Preparing remote side...</source>
         <translation>Forbereder fjern-side...</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxQtVersion</name>
+    <name>Qnx</name>
     <message>
         <source>QNX %1</source>
         <extracomment>Qt Version is meant for QNX</extracomment>
@@ -34357,21 +34349,14 @@ Er du sikker på, at du vil fortsætte?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxRunConfiguration</name>
+    <name>Qnx</name>
     <message>
         <source>Path to Qt libraries on device</source>
         <translation>Sti til Qt-biblioteker på enhed</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxSettingsPage</name>
+    <name>Qnx</name>
-    <message>
-        <source>QNX</source>
-        <translation>QNX</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxSettingsWidget</name>
     <message>
         <source>Generate kits</source>
         <translation>Generer kits</translation>
@@ -34428,7 +34413,7 @@ Er du sikker på, at du vil fortsætte?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxToolChainConfigWidget</name>
+    <name>Qnx</name>
     <message>
         <source>&amp;Compiler path:</source>
         <translation>&amp;Kompilersti:</translation>
@@ -34444,14 +34429,14 @@ Er du sikker på, at du vil fortsætte?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxToolChainFactory</name>
+    <name>Qnx</name>
     <message>
         <source>QCC</source>
         <translation>QCC</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::Slog2InfoRunner</name>
+    <name>Qnx</name>
     <message>
         <source>Warning: &quot;slog2info&quot; is not found on the device, debug output not available.</source>
         <translation>Advarsel: &quot;slog2info&quot; findes ikke på enheden, fejlret-output ikke tilgængeligt.</translation>
@@ -45263,7 +45248,7 @@ Gemning mislykkedes.</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeployConfiguration</name>
+    <name>Qnx</name>
     <message>
         <source>Deploy to QNX Device</source>
         <translation>Udsend til QNX-enhed</translation>

share/qtcreator/translations/qtcreator_de.ts

@@ -19965,7 +19965,7 @@ gehören nicht zu den verifizierten Remotes in %3. Anderes Verzeichnis angeben?<
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDebugSupport</name>
+    <name>Qnx</name>
     <message>
         <source>Preparing remote side...</source>
         <translation>Bereite Gegenseite vor...</translation>
@@ -19980,7 +19980,7 @@ gehören nicht zu den verifizierten Remotes in %3. Anderes Verzeichnis angeben?<
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxRunConfiguration</name>
+    <name>Qnx</name>
     <message>
         <source>Executable on device:</source>
         <translation>Ausführbare Datei auf Mobilgerät:</translation>
@@ -20174,7 +20174,7 @@ hinzufügen, um dem QML-Editor den wahrscheinlichen URI mitzuteilen.</translatio
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxQtVersion</name>
+    <name>Qnx</name>
     <message>
         <source>QNX %1</source>
         <extracomment>Qt Version is meant for QNX</extracomment>
@@ -23493,7 +23493,7 @@ Teilnamen können verwendet werden, sofern sie eindeutig sind.</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeviceTester</name>
+    <name>Qnx</name>
     <message>
         <source>Checking that files can be created in /var/run...</source>
         <translation>Prüfe, ob Dateien in /var/run angelegt werden können...</translation>
@@ -25817,7 +25817,7 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::Slog2InfoRunner</name>
+    <name>Qnx</name>
     <message>
         <source>Warning: &quot;slog2info&quot; is not found on the device, debug output not available.</source>
         <translation>Warnung: &quot;slog2info&quot; konnte nicht auf dem Gerät gefunden werden, es ist daher keine Debugausgabe verfügbar.</translation>
@@ -26002,7 +26002,7 @@ Weder der Pfad zur Bibliothek noch der Pfad zu den Headerdateien wird zur .pro-D
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxToolChainConfigWidget</name>
+    <name>Qnx</name>
     <message>
         <source>&amp;Compiler path:</source>
         <translation>&amp;Compiler-Pfad:</translation>
@@ -26958,7 +26958,7 @@ Möchten Sie es beenden?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxAttachDebugSupport</name>
+    <name>Qnx</name>
     <message>
         <source>Remote QNX process %1</source>
         <translation>Entfernter QNX-Prozess %1</translation>
@@ -27168,7 +27168,7 @@ Möchten Sie es beenden?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxPlugin</name>
+    <name>Qnx</name>
     <message>
         <source>Attach to remote QNX application...</source>
         <translation>An entfernte QNX-Anwendung anhängen...</translation>
@@ -27286,7 +27286,7 @@ Möchten Sie es beenden?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeployQtLibrariesDialog</name>
+    <name>Qnx</name>
     <message>
         <source>Qt library to deploy:</source>
         <translation>Zum Deployment vorgesehene Qt-Bibliothek:</translation>
@@ -27337,7 +27337,7 @@ Möchten Sie fortfahren?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxSettingsWidget</name>
+    <name>Qnx</name>
     <message>
         <source>Generate kits</source>
         <translation>Kits erzeugen</translation>
@@ -28155,7 +28155,7 @@ Bitte installieren Sie ein Android-SDK der API-Version %1 oder neuer.</translati
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxConfiguration</name>
+    <name>Qnx</name>
     <message>
         <source>The following errors occurred while activating the QNX configuration:</source>
         <translation>Die folgenden Fehler traten beim Aktivieren der QNX-Konfiguration auf:</translation>
@@ -37151,11 +37151,7 @@ Siehe auch die Einstellungen für Google Test.</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDevice</name>
+    <name>Qnx</name>
-    <message>
-        <source>QNX</source>
-        <translation>QNX</translation>
-    </message>
     <message>
         <source>QNX Device</source>
         <translation>QNX-Gerät</translation>
@@ -37166,7 +37162,7 @@ Siehe auch die Einstellungen für Google Test.</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeviceWizard</name>
+    <name>Qnx</name>
     <message>
         <source>New QNX Device Configuration Setup</source>
         <translation>Neue QNX-Geräte-Konfiguration</translation>
@@ -39495,13 +39491,6 @@ Bitte aktualisieren Sie Ihr Kit (%3) oder wählen Sie eine mkspec für qmake, di
         <translation>Mediandauer</translation>
     </message>
 </context>
-<context>
-    <name>Qnx::Internal::QnxQmlProfilerSupport</name>
-    <message>
-        <source>Preparing remote side...</source>
-        <translation>Bereite Gegenseite vor...</translation>
-    </message>
-</context>
 <context>
     <name>ScxmlEditor::Common::ColorThemes</name>
     <message>
@@ -42593,7 +42582,7 @@ Speichern fehlgeschlagen.</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeployConfiguration</name>
+    <name>Qnx</name>
     <message>
         <source>Deploy to QNX Device</source>
         <translation>Deployment auf QNX-Gerät</translation>
@@ -50472,7 +50461,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxToolChain</name>
+    <name>Qnx</name>
     <message>
         <source>QCC</source>
         <translation>QCC</translation>

share/qtcreator/translations/qtcreator_hr.ts

@@ -7869,7 +7869,7 @@ the program.</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeployQtLibrariesDialog</name>
+    <name>Qnx</name>
     <message>
         <source>Deploy Qt to QNX Device</source>
         <translation>Implementiraj Qt na QNX uređaju</translation>
@@ -7920,7 +7920,7 @@ Sigurno želiš nastaviti?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxSettingsWidget</name>
+    <name>Qnx</name>
     <message>
         <source>Generate kits</source>
         <translation>Generiraj komplete</translation>
@@ -37369,208 +37369,6 @@ Saving failed.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>Qnx::Internal::QnxQmlProfilerSupport</name>
-    <message>
-        <source>Preparing remote side...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxConfiguration</name>
-    <message>
-        <source>The following errors occurred while activating the QNX configuration:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot Set Up QNX Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Debugger for %1 (%2)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QCC for %1 (%2)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Kit for %1 (%2)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>- No GCC compiler found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>- No targets found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDebugSupport</name>
-    <message>
-        <source>Preparing remote side...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Project source directory:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Local executable:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxAttachDebugSupport</name>
-    <message>
-        <source>Remote QNX process %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDevice</name>
-    <message>
-        <source>Deploy Qt libraries...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QNX</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeviceFactory</name>
-    <message>
-        <source>QNX Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeviceTester</name>
-    <message>
-        <source>Checking that files can be created in /var/run...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Files can be created in /var/run.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Files cannot be created in /var/run.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>An error occurred while checking that files can be created in /var/run.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 not found.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>An error occurred while checking for %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SSH connection error: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Checking for %1...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeviceWizard</name>
-    <message>
-        <source>New QNX Device Configuration Setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QNX Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeployConfiguration</name>
-    <message>
-        <source>Deploy to QNX Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxPlugin</name>
-    <message>
-        <source>Attach to remote QNX application...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxQtVersion</name>
-    <message>
-        <source>QNX %1</source>
-        <extracomment>Qt Version is meant for QNX</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No SDP path was set up.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxRunConfiguration</name>
-    <message>
-        <source>Path to Qt libraries on device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxSettingsPage</name>
-    <message>
-        <source>QNX</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxToolChainFactory</name>
-    <message>
-        <source>QCC</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxToolChainConfigWidget</name>
-    <message>
-        <source>&amp;Compiler path:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SDP path:</source>
-        <extracomment>SDP refers to &apos;Software Development Platform&apos;.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;ABI:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::Slog2InfoRunner</name>
-    <message>
-        <source>Warning: &quot;slog2info&quot; is not found on the device, debug output not available.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot show slog2info output. Error: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>QtVersion</name>
     <message>

share/qtcreator/translations/qtcreator_ja.ts

@@ -30815,14 +30815,14 @@ Do you want to save the data first?</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxAbstractRunSupport</name>
+    <name>Qnx</name>
     <message>
         <source>Not enough free ports on device for debugging.</source>
         <translation>デバイスにデバッグ用の空きポートがありません。</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxAnalyzeSupport</name>
+    <name>Qnx</name>
     <message>
         <source>Preparing remote side...</source>
         <translation>リモート側の準備...</translation>
@@ -30835,69 +30835,17 @@ Do you want to save the data first?</source>
         <source>Initial setup failed: %1</source>
         <translation>初回セットアップ失敗: %1</translation>
     </message>
-    <message>
-        <source>Warning: &quot;slog2info&quot; is not found on the device, debug output not available.</source>
-        <translation>警告: &quot;slog2info&quot; がデバイスに見つかりません。デバッグ出力は利用できません。</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDebugSupport</name>
-    <message>
-        <source>Preparing remote side...</source>
-        <translation>リモート側の準備...</translation>
-    </message>
-    <message>
-        <source>Project source directory:</source>
-        <translation>プロジェクトソースディレクトリ:</translation>
-    </message>
-    <message>
-        <source>Local executable:</source>
-        <translation>ローカル実行ファイル:</translation>
-    </message>
-    <message>
-        <source>The %1 process closed unexpectedly.</source>
-        <translation>プロセス %1 が、予期せず終了しました。</translation>
-    </message>
-    <message>
-        <source>Initial setup failed: %1</source>
-        <translation>初回セットアップ失敗: %1</translation>
-    </message>
-    <message>
-        <source>Warning: &quot;slog2info&quot; is not found on the device, debug output not available.</source>
-        <translation>警告: &quot;slog2info&quot; がデバイスに見つかりません。デバッグ出力は利用できません。</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeployConfigurationFactory</name>
     <message>
         <source>Deploy to QNX Device</source>
         <translation>QNX デバイスにデプロイ</translation>
     </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDevice</name>
-    <message>
-        <source>QNX</source>
-        <translation>QNX</translation>
-    </message>
-    <message>
-        <source>QNX Device</source>
-        <translation>QNX デバイス</translation>
-    </message>
     <message>
         <source>Deploy Qt libraries...</source>
         <translation>Qt ライブラリのデプロイ...</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeviceFactory</name>
+    <name>Qnx</name>
-    <message>
-        <source>QNX Device</source>
-        <translation>QNX デバイス</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeviceWizard</name>
     <message>
         <source>QNX Device</source>
         <translation>QNX デバイス</translation>
@@ -30908,7 +30856,7 @@ Do you want to save the data first?</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeviceTester</name>
+    <name>Qnx</name>
     <message>
         <source>Checking that files can be created in /var/run...</source>
         <translation>/var/run にファイルが作成できることを確認しています...</translation>
@@ -30951,7 +30899,7 @@ Do you want to save the data first?</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxQtVersion</name>
+    <name>Qnx</name>
     <message>
         <source>QNX %1</source>
         <extracomment>Qt Version is meant for QNX</extracomment>
@@ -30967,7 +30915,7 @@ Do you want to save the data first?</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxRunConfiguration</name>
+    <name>Qnx</name>
     <message>
         <source>Path to Qt libraries on device:</source>
         <translation>デバイス上の Qt ライブラリのパス:</translation>
@@ -30990,21 +30938,14 @@ Do you want to save the data first?</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxRunConfigurationFactory</name>
+    <name>Qnx</name>
     <message>
         <source>%1 on QNX Device</source>
         <translation>QNX デバイス上の %1</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxToolChainFactory</name>
+    <name>Qnx</name>
-    <message>
-        <source>QCC</source>
-        <translation>QCC</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxToolChainConfigWidget</name>
     <message>
         <source>&amp;Compiler path:</source>
         <translation>コンパイラのパス(&amp;C):</translation>
@@ -31025,7 +30966,7 @@ Do you want to save the data first?</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::Slog2InfoRunner</name>
+    <name>Qnx</name>
     <message>
         <source>Warning: &quot;slog2info&quot; is not found on the device, debug output not available.</source>
         <translation>警告: &quot;slog2info&quot; がデバイスに見つかりません。デバッグ出力は利用できません。</translation>
@@ -36016,7 +35957,7 @@ kill しますか？</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxAttachDebugDialog</name>
+    <name>Qnx</name>
     <message>
         <source>Project source directory:</source>
         <translation>プロジェクトソースディレクトリ:</translation>
@@ -36027,7 +35968,7 @@ kill しますか？</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxAttachDebugSupport</name>
+    <name>Qnx</name>
     <message>
         <source>No free ports for debugging.</source>
         <translation>デバッグ用の空きポートがありません。</translation>
@@ -36245,7 +36186,7 @@ kill しますか？</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxPlugin</name>
+    <name>Qnx</name>
     <message>
         <source>Attach to remote QNX application...</source>
         <translation>リモートの QNX アプリケーションにアタッチ...</translation>
@@ -36374,7 +36315,7 @@ kill しますか？</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeployQtLibrariesDialog</name>
+    <name>Qnx</name>
     <message>
         <source>Deploy Qt to BlackBerry Device</source>
         <translation>Qt を BlackBerry デバイスにデプロイ</translation>
@@ -36425,7 +36366,7 @@ Are you sure you want to continue?</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxSettingsWidget</name>
+    <name>Qnx</name>
     <message>
         <source>Form</source>
         <translation>フォーム</translation>
@@ -36480,10 +36421,6 @@ Are you sure you want to continue?</source>
         <translation>本当に削除を行いますか:
 %1？</translation>
     </message>
-    <message>
-        <source>QNX</source>
-        <translation>QNX</translation>
-    </message>
     <message>
         <source>Add...</source>
         <translation>追加...</translation>
@@ -37175,7 +37112,7 @@ API バージョンが %1 以上の SDK をインストールしてください
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxConfiguration</name>
+    <name>Qnx</name>
     <message>
         <source>The following errors occurred while activating the QNX configuration:</source>
         <translation>QNX 設定のアクティベート中に以下のエラーが発生しました:</translation>
@@ -37229,7 +37166,7 @@ API バージョンが %1 以上の SDK をインストールしてください
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxSettingsPage</name>
+    <name>Qnx</name>
     <message>
         <source>QNX</source>
         <translation>QNX</translation>
@@ -45718,13 +45655,6 @@ Android パッケージソースディレクトリのファイルはビルドデ
         <translation>グリフ</translation>
     </message>
 </context>
-<context>
-    <name>Qnx::Internal::QnxRunControl</name>
-    <message>
-        <source>Warning: &quot;slog2info&quot; is not found on the device, debug output not available.</source>
-        <translation>警告: &apos;slog2info&apos; がデバイスに見つかりません。デバッグ出力は利用できません。</translation>
-    </message>
-</context>
 <context>
     <name>QtSupport::ProMessageHandler</name>
     <message>
@@ -56162,21 +56092,7 @@ Stepping into the module or setting breakpoints by file and line is expected to
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxQmlProfilerSupport</name>
+    <name>Qnx</name>
-    <message>
-        <source>Preparing remote side...</source>
-        <translation>リモート側の準備...</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeployConfiguration</name>
-    <message>
-        <source>Deploy to QNX Device</source>
-        <translation>QNX デバイスにデプロイ</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxToolChain</name>
     <message>
         <source>QCC</source>
         <translation>QCC</translation>

share/qtcreator/translations/qtcreator_pl.ts

@@ -22858,21 +22858,21 @@ poinstruuje Qt Creatora o URI.</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDebugSupport</name>
+    <name>Qnx</name>
     <message>
         <source>Preparing remote side...</source>
         <translation>Przygotowywanie zdalnej strony...</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeployConfigurationFactory</name>
+    <name>Qnx</name>
     <message>
         <source>Deploy to QNX Device</source>
         <translation>Zainstaluj na urządzeniu QNX</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxQtVersion</name>
+    <name>Qnx</name>
     <message>
         <source>QNX %1</source>
         <extracomment>Qt Version is meant for QNX</extracomment>
@@ -22884,14 +22884,14 @@ poinstruuje Qt Creatora o URI.</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxRunConfiguration</name>
+    <name>Qnx</name>
     <message>
         <source>Path to Qt libraries on device:</source>
         <translation>Ścieżka do bibliotek Qt na urządzeniu:</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxRunConfigurationFactory</name>
+    <name>Qnx</name>
     <message>
         <source>%1 on QNX Device</source>
         <translation>%1 na urządzeniu QNX</translation>
@@ -26894,7 +26894,7 @@ Zdalny: %4</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeviceTester</name>
+    <name>Qnx</name>
     <message>
         <source>%1 found.</source>
         <translation>Znaleziono %1.</translation>
@@ -28723,14 +28723,14 @@ Proszę zamknąć wszystkie instancje tej aplikacji przed uruchomieniem budowani
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxToolChainFactory</name>
+    <name>Qnx</name>
     <message>
         <source>QCC</source>
         <translation>QCC</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxToolChainConfigWidget</name>
+    <name>Qnx</name>
     <message>
         <source>&amp;Compiler path:</source>
         <translation>Ścieżka do &amp;kompilatora:</translation>
@@ -28746,7 +28746,7 @@ Proszę zamknąć wszystkie instancje tej aplikacji przed uruchomieniem budowani
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::Slog2InfoRunner</name>
+    <name>Qnx</name>
     <message>
         <source>Warning: &quot;slog2info&quot; is not found on the device, debug output not available.</source>
         <translation>Ostrzeżenie: brak&quot;slog2info&quot; na urządzeniu, komunikaty debugowe nie będą dostępne.</translation>
@@ -29862,7 +29862,7 @@ Czy przerwać ją?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxAttachDebugDialog</name>
+    <name>Qnx</name>
     <message>
         <source>Project source directory:</source>
         <translation>Katalog ze źródłami projektu:</translation>
@@ -29873,7 +29873,7 @@ Czy przerwać ją?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxAttachDebugSupport</name>
+    <name>Qnx</name>
     <message>
         <source>No free ports for debugging.</source>
         <translation>Brak wolnych portów do debugowania.</translation>
@@ -30398,7 +30398,7 @@ Instalowanie lokalnych bibliotek Qt nie jest kompatybilne z Androidem 5.</transl
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeployQtLibrariesDialog</name>
+    <name>Qnx</name>
     <message>
         <source>Qt library to deploy:</source>
         <translation>Biblioteka Qt do zainstalowania:</translation>
@@ -30449,7 +30449,7 @@ Czy kontynuować instalację?</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxSettingsWidget</name>
+    <name>Qnx</name>
     <message>
         <source>Form</source>
         <translation>Formularz</translation>
@@ -33997,7 +33997,7 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxConfiguration</name>
+    <name>Qnx</name>
     <message>
         <source>The following errors occurred while activating the QNX configuration:</source>
         <translation>Wystąpiły następujące błędy podczas aktywowania konfiguracji QNX:</translation>
@@ -34028,14 +34028,14 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxPlugin</name>
+    <name>Qnx</name>
     <message>
         <source>Attach to remote QNX application...</source>
         <translation>Dołącz do zdalnej aplikacji QNX...</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxSettingsPage</name>
+    <name>Qnx</name>
     <message>
         <source>QNX</source>
         <translation>QNX</translation>
@@ -40470,25 +40470,14 @@ w ścieżce.</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDevice</name>
+    <name>Qnx</name>
-    <message>
-        <source>QNX</source>
-        <translation>QNX</translation>
-    </message>
     <message>
         <source>Deploy Qt libraries...</source>
         <translation>Instaluj biblioteki Qt...</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeviceFactory</name>
+    <name>Qnx</name>
-    <message>
-        <source>QNX Device</source>
-        <translation>Urządzenie QNX</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeviceWizard</name>
     <message>
         <source>QNX Device</source>
         <translation>Urządzenie QNX</translation>
@@ -44185,13 +44174,6 @@ Błąd: %5</translation>
         <translation>Pliki typeinfo poprawnie odczytane.</translation>
     </message>
 </context>
-<context>
-    <name>Qnx::Internal::QnxQmlProfilerSupport</name>
-    <message>
-        <source>Preparing remote side...</source>
-        <translation>Przygotowywanie zdalnej strony...</translation>
-    </message>
-</context>
 <context>
     <name>RemoteLinux::FifoGatherer</name>
     <message>

share/qtcreator/translations/qtcreator_ru.ts

@@ -43927,14 +43927,14 @@ Saving failed.</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxAttachDebugSupport</name>
+    <name>Qnx</name>
     <message>
         <source>Remote QNX process %1</source>
         <translation>Внешний процесс QNX %1</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxConfiguration</name>
+    <name>Qnx</name>
     <message>
         <source>The following errors occurred while activating the QNX configuration:</source>
         <translation>При активации конфигурации QNX возникли следующие ошибки:</translation>
@@ -43965,11 +43965,7 @@ Saving failed.</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDebugSupport</name>
+    <name>Qnx</name>
-    <message>
-        <source>Preparing remote side...</source>
-        <translation>Подготовка удалённой стороны...</translation>
-    </message>
     <message>
         <source>Project source directory:</source>
         <translation>Каталог исходного кода проекта:</translation>
@@ -43980,14 +43976,14 @@ Saving failed.</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeployConfiguration</name>
+    <name>Qnx</name>
     <message>
         <source>Deploy to QNX Device</source>
         <translation>Развернуть на устройство QNX</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeployQtLibrariesDialog</name>
+    <name>Qnx</name>
     <message>
         <source>Qt library to deploy:</source>
         <translation>Библиотека Qt для развёртывания:</translation>
@@ -44038,7 +44034,7 @@ Are you sure you want to continue?</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDevice</name>
+    <name>Qnx</name>
     <message>
         <source>QNX</source>
         <translation>QNX</translation>
@@ -44053,7 +44049,7 @@ Are you sure you want to continue?</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeviceTester</name>
+    <name>Qnx</name>
     <message>
         <source>Checking that files can be created in /var/run...</source>
         <translation>Проверка возможности создавать файлы в /var/run...</translation>
@@ -44092,28 +44088,28 @@ Are you sure you want to continue?</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeviceWizard</name>
+    <name>Qnx</name>
     <message>
         <source>New QNX Device Configuration Setup</source>
         <translation>Настройка новой конфигурации устройства QNX</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxPlugin</name>
+    <name>Qnx</name>
     <message>
         <source>Attach to remote QNX application...</source>
         <translation>Подключиться к приложению QNX...</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxQmlProfilerSupport</name>
+    <name>Qnx</name>
     <message>
         <source>Preparing remote side...</source>
         <translation>Подготовка удалённой стороны...</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxQtVersion</name>
+    <name>Qnx</name>
     <message>
         <source>QNX %1</source>
         <extracomment>Qt Version is meant for QNX</extracomment>
@@ -44125,7 +44121,7 @@ Are you sure you want to continue?</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxRunConfiguration</name>
+    <name>Qnx</name>
     <message>
         <source>Executable on device:</source>
         <translation>Программа на устройстве:</translation>
@@ -44144,7 +44140,7 @@ Are you sure you want to continue?</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxSettingsWidget</name>
+    <name>Qnx</name>
     <message>
         <source>Generate kits</source>
         <translation>Создать комплекты</translation>
@@ -44195,24 +44191,20 @@ Are you sure you want to continue?</source>
         <translation>Удалить:
  %1?</translation>
     </message>
-    <message>
-        <source>QNX</source>
-        <translation>QNX</translation>
-    </message>
     <message>
         <source>Add...</source>
         <translation>Добавить...</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxToolChain</name>
+    <name>Qnx</name>
     <message>
         <source>QCC</source>
         <translation>QCC</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxToolChainConfigWidget</name>
+    <name>Qnx</name>
     <message>
         <source>&amp;Compiler path:</source>
         <translation>Путь к &amp;компилятору:</translation>
@@ -44228,7 +44220,7 @@ Are you sure you want to continue?</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::Slog2InfoRunner</name>
+    <name>Qnx</name>
     <message>
         <source>Warning: &quot;slog2info&quot; is not found on the device, debug output not available.</source>
         <translation>Предупреждение: «slog2info» не найдена на устройстве, вывод отладчика недоступен.</translation>

share/qtcreator/translations/qtcreator_zh_CN.ts

@@ -28383,126 +28383,6 @@ Id必须以小写字母开头。</translation>
         <translation>包:</translation>
     </message>
 </context>
-<context>
-    <name>MaemoDeployStepWidget</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">界面</translation>
-    </message>
-    <message>
-        <source>Device configuration:</source>
-        <translation type="obsolete">设备配置:</translation>
-    </message>
-    <message>
-        <source>Also deploy to sysroot</source>
-        <translation type="obsolete">同时部署到sysroot</translation>
-    </message>
-    <message>
-        <source>These show the INSTALLS settings from the project file(s).</source>
-        <translation type="obsolete">显示来自于项目文件的安装(INSTALLS)设置.</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Files to install for subproject:&lt;/b&gt;</source>
-        <translation type="obsolete">&lt;b&gt;子项目的安装文件&lt;/b&gt;</translation>
-    </message>
-    <message>
-        <source>Edit the project file to add or remove entries.</source>
-        <translation type="obsolete">编辑项目文件添加或删除条目.</translation>
-    </message>
-    <message>
-        <source>Add Desktop File</source>
-        <translation type="obsolete">添加桌面文件</translation>
-    </message>
-    <message>
-        <source>Add Launcher Icon ...</source>
-        <translation type="obsolete">添加一个启动图标 ...</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;irrelevant&quot;&gt;Manage device configurations&lt;/a&gt;</source>
-        <translation type="obsolete">&lt;a href=&quot;irrelevant&quot;&gt;设置设备选项&lt;/a&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>MaemoProFilesUpdateDialog</name>
-    <message>
-        <source>Maemo Deployment Issue</source>
-        <translation type="obsolete">Maemo部署事件</translation>
-    </message>
-    <message>
-        <source>Check all</source>
-        <translation type="obsolete">选中所有</translation>
-    </message>
-    <message>
-        <source>Uncheck All</source>
-        <translation type="obsolete">取消选中</translation>
-    </message>
-    <message>
-        <source>The project files listed below do not contain Maemo deployment information, which means the respective targets cannot be deployed to and/or run on a device. Qt Creator will add the missing information to these files if you check the respective rows below.</source>
-        <translation type="obsolete">下面列出的项目文件不包含部署Maemo的相关信息，这也就意味着相关目标在设备上无法部署或运行. Qt Creator 将会添加这些信息如果选则了以下各行。</translation>
-    </message>
-    <message>
-        <source>&amp;Check all</source>
-        <translation type="obsolete">选中全部(&amp;C)</translation>
-    </message>
-    <message>
-        <source>&amp;Uncheck All</source>
-        <translation type="obsolete">取消选中(&amp;U)</translation>
-    </message>
-</context>
-<context>
-    <name>MobileAppWizardOptionPage</name>
-    <message>
-        <source>WizardPage</source>
-        <translation type="obsolete">向导页面</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation type="obsolete">概要</translation>
-    </message>
-    <message>
-        <source>Orientation behavior:</source>
-        <translation type="obsolete">自适应行为:</translation>
-    </message>
-    <message>
-        <source>Application icon (.svg):</source>
-        <translation type="obsolete">应用程序图标(.svg):</translation>
-    </message>
-    <message>
-        <source>Target UID3:</source>
-        <translation type="obsolete">目标UID3:</translation>
-    </message>
-    <message>
-        <source>Enable network access</source>
-        <translation type="obsolete">允许网络访问</translation>
-    </message>
-    <message>
-        <source>Maemo Specific</source>
-        <translation type="obsolete">Maemo设备配置</translation>
-    </message>
-    <message>
-        <source>Application icon (64x64):</source>
-        <translation type="obsolete">应用程序图标(64x64):</translation>
-    </message>
-</context>
-<context>
-    <name>MobileLibraryWizardOptionPage</name>
-    <message>
-        <source>WizardPage</source>
-        <translation type="obsolete">向导页面</translation>
-    </message>
-    <message>
-        <source>Enable network access</source>
-        <translation type="obsolete">允许网络访问</translation>
-    </message>
-    <message>
-        <source>Target UID3:</source>
-        <translation type="obsolete">目标UID3:</translation>
-    </message>
-    <message>
-        <source>Plugin&apos;s directory name:</source>
-        <translation type="obsolete">插件目录名称:</translation>
-    </message>
-</context>
 <context>
     <name>QtQuickAppWizardSourcesPage</name>
     <message>
@@ -32574,158 +32454,6 @@ Local pulls are not applied to the master branch.</source>
         <translation type="obsolete">生成SSH密钥(&amp;G)...</translation>
     </message>
 </context>
-<context>
-    <name>MaemoDeviceConfigWizardKeyCreationPage</name>
-    <message>
-        <source>WizardPage</source>
-        <translation type="obsolete">向导页面</translation>
-    </message>
-    <message>
-        <source>Qt Creator will now generate a new pair of keys. Please enter the directory to save the key files in and then press &quot;Create Keys&quot;.</source>
-        <translation type="obsolete">Qt Creator 将会生成密钥. 请输入生成文件存放的目录名称然后点击&quot;生成密钥&quot;.</translation>
-    </message>
-    <message>
-        <source>Directory:</source>
-        <translation type="obsolete">目录:</translation>
-    </message>
-    <message>
-        <source>Create Keys</source>
-        <translation type="obsolete">密钥创建</translation>
-    </message>
-</context>
-<context>
-    <name>MaemoDeviceConfigWizardKeyDeploymentPage</name>
-    <message>
-        <source>WizardPage</source>
-        <translation type="obsolete">向导页面</translation>
-    </message>
-    <message>
-        <source>Device address:</source>
-        <translation type="obsolete">设备地址:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation type="obsolete">密码:</translation>
-    </message>
-    <message>
-        <source>Deploy Key</source>
-        <translation type="obsolete">部署密钥</translation>
-    </message>
-</context>
-<context>
-    <name>MaemoDeviceConfigWizardCheckPreviousKeySetupPage</name>
-    <message>
-        <source>WizardPage</source>
-        <translation type="obsolete">向导页面</translation>
-    </message>
-    <message>
-        <source>Has a passwordless (key-based) login already been set up for this device?</source>
-        <translation type="obsolete">这个设备已经设置了不需要密码(密钥验证)登录了么?</translation>
-    </message>
-    <message>
-        <source>Yes, and the private key is located at</source>
-        <translation type="obsolete">是的，私钥保存在</translation>
-    </message>
-    <message>
-        <source>No</source>
-        <translation type="obsolete">否</translation>
-    </message>
-</context>
-<context>
-    <name>MaemoDeviceConfigWizardReuseKeysCheckPage</name>
-    <message>
-        <source>WizardPage</source>
-        <translation type="obsolete">向导页面</translation>
-    </message>
-    <message>
-        <source>Re-use existing keys</source>
-        <translation type="obsolete">重复使用现有密钥</translation>
-    </message>
-    <message>
-        <source>File containing the public key:</source>
-        <translation type="obsolete">文件包含公钥:</translation>
-    </message>
-    <message>
-        <source>File containing the private key:</source>
-        <translation type="obsolete">文件包含私钥:</translation>
-    </message>
-    <message>
-        <source>Create new keys</source>
-        <translation type="obsolete">创建新密钥</translation>
-    </message>
-</context>
-<context>
-    <name>MaemoDeviceConfigWizardStartPage</name>
-    <message>
-        <source>WizardPage</source>
-        <translation type="obsolete">向导页面</translation>
-    </message>
-    <message>
-        <source>The name to identify this configuration:</source>
-        <translation type="obsolete">说明配置的名称:</translation>
-    </message>
-    <message>
-        <source>The system running on the device:</source>
-        <translation type="obsolete">系统运行在设备:</translation>
-    </message>
-    <message>
-        <source>The kind of device:</source>
-        <translation type="obsolete">设备类型:</translation>
-    </message>
-    <message>
-        <source>Emulator (Qemu)</source>
-        <translation type="obsolete">模拟器(Qemu)</translation>
-    </message>
-    <message>
-        <source>Hardware Device</source>
-        <translation type="obsolete">硬件设备</translation>
-    </message>
-    <message>
-        <source>The device&apos;s host name or IP address:</source>
-        <translation type="obsolete">设备的域名或者IP地址:</translation>
-    </message>
-    <message>
-        <source>Emulator</source>
-        <translation type="obsolete">模拟器</translation>
-    </message>
-    <message>
-        <source>The SSH server port:</source>
-        <translation type="obsolete">SSH 服务器端口:</translation>
-    </message>
-</context>
-<context>
-    <name>MaemoPublishingWizardPageFremantleFree</name>
-    <message>
-        <source>WizardPage</source>
-        <translation type="obsolete">向导页面</translation>
-    </message>
-    <message>
-        <source>Choose build configuration:</source>
-        <translation type="obsolete">选择构建配置:</translation>
-    </message>
-    <message>
-        <source>Only create source package, do not upload</source>
-        <translation type="obsolete">仅创建资源包，不要上传</translation>
-    </message>
-</context>
-<context>
-    <name>MaemoPublishingFileSelectionDialog</name>
-    <message>
-        <source>Choose Package Contents</source>
-        <translation type="obsolete">选择软件包内容</translation>
-    </message>
-</context>
-<context>
-    <name>MaemoPublishingResultPageFremantleFree</name>
-    <message>
-        <source>WizardPage</source>
-        <translation type="obsolete">向导页面</translation>
-    </message>
-    <message>
-        <source>Progress</source>
-        <translation type="obsolete">进程</translation>
-    </message>
-</context>
 <context>
     <name>MaemoPublishingUploadSettingsPageFremantleFree</name>
     <message>
@@ -47416,11 +47144,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BarDescriptorFileImageWizardPage</name>
+    <name>Qnx</name>
-    <message>
-        <source>WizardPage</source>
-        <translation>向导页面</translation>
-    </message>
     <message>
         <source>Icon:</source>
         <translation>图标:</translation>
@@ -47463,14 +47187,14 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryDeployConfigurationWidget</name>
+    <name>Qnx</name>
     <message>
         <source>Packages to deploy:</source>
         <translation>要部署的包:</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryDeviceConfigurationWidget</name>
+    <name>Qnx</name>
     <message>
         <source>&amp;Device name:</source>
         <translation>设备名(&amp;D):</translation>
@@ -47497,7 +47221,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryDeviceConfigurationWizardSetupPage</name>
+    <name>Qnx</name>
     <message>
         <source>WizardPage</source>
         <translation>向导页面</translation>
@@ -47526,29 +47250,10 @@ p, li { white-space: pre-wrap; }
         <source>Simulator</source>
         <translation>模拟器</translation>
     </message>
-    <message>
-        <source>Debug token:</source>
-        <translation>调试标记(token):</translation>
-    </message>
     <message>
         <source>Connection Details</source>
         <translation>连接详情</translation>
     </message>
-    <message>
-        <source>BlackBerry Device</source>
-        <translation>黑莓设备</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryDeviceConfigurationWizardSshKeyPage</name>
-    <message>
-        <source>WizardPage</source>
-        <translation>向导页面</translation>
-    </message>
-    <message>
-        <source>Private key file:</source>
-        <translation>私钥文件:</translation>
-    </message>
     <message>
         <source>Public key file:</source>
         <translation>公钥文件:</translation>
@@ -47571,7 +47276,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryRunConfigurationWidget</name>
+    <name>Qnx</name>
     <message>
         <source>Device:</source>
         <translation>设备:</translation>
@@ -47582,7 +47287,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxBaseQtConfigWidget</name>
+    <name>Qnx</name>
     <message>
         <source>SDK:</source>
         <translation>SDK:</translation>
@@ -52834,7 +52539,7 @@ references to elements in other files, loops, etc.)</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryAbstractDeployStep</name>
+    <name>Qnx</name>
     <message>
         <source>Starting: &quot;%1&quot; %2</source>
         <translation>正在启动 &quot;%1&quot; %2
@@ -52842,7 +52547,7 @@ references to elements in other files, loops, etc.)</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryApplicationRunner</name>
+    <name>Qnx</name>
     <message>
         <source>Launching application failed</source>
         <translation>程序启动失败</translation>
@@ -52853,7 +52558,7 @@ references to elements in other files, loops, etc.)</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryCreatePackageStep</name>
+    <name>Qnx</name>
     <message>
         <source>Create BAR packages</source>
         <translation>创建BAR包</translation>
@@ -52892,35 +52597,11 @@ references to elements in other files, loops, etc.)</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryCreatePackageStepConfigWidget</name>
+    <name>Qnx</name>
     <message>
         <source>&lt;b&gt;Create packages&lt;/b&gt;</source>
         <translation>&lt;b&gt;创建包&lt;/b&gt;</translation>
     </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryCreatePackageStepFactory</name>
-    <message>
-        <source>Create BAR Packages</source>
-        <translation>创建BAR包</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryDeployConfiguration</name>
-    <message>
-        <source>Deploy to BlackBerry Device</source>
-        <translation>部署到黑莓设备上</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryDeployConfigurationFactory</name>
-    <message>
-        <source>Deploy to BlackBerry Device</source>
-        <translation>部署到黑莓设备上</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryDeployInformation</name>
     <message>
         <source>Enabled</source>
         <translation>启用</translation>
@@ -52935,7 +52616,7 @@ references to elements in other files, loops, etc.)</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryDeployStep</name>
+    <name>Qnx</name>
     <message>
         <source>Deploy packages</source>
         <translation>部署包</translation>
@@ -52948,45 +52629,41 @@ references to elements in other files, loops, etc.)</source>
         <source>No hostname specified for device</source>
         <translation>未指定设备的主机名</translation>
     </message>
-    <message>
-        <source>No packages enabled for deployment</source>
-        <translation>没有设置为可供部署的包</translation>
-    </message>
     <message>
         <source>Package &apos;%1&apos; does not exist. Create the package first.</source>
         <translation>包 &apos;%1&apos;不存在。请先创建包。</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryDeployStepConfigWidget</name>
+    <name>Qnx</name>
     <message>
         <source>&lt;b&gt;Deploy packages&lt;/b&gt;</source>
         <translation>&lt;b&gt;部署包&lt;/b&gt;</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryDeployStepFactory</name>
+    <name>Qnx</name>
     <message>
         <source>Deploy Package</source>
         <translation>部署包</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryDeviceConfiguration</name>
+    <name>Qnx</name>
     <message>
         <source>BlackBerry</source>
         <translation>黑莓</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryDeviceConfigurationFactory</name>
+    <name>Qnx</name>
     <message>
         <source>BlackBerry Device</source>
         <translation>黑莓设备</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryDeviceConfigurationWizard</name>
+    <name>Qnx</name>
     <message>
         <source>New BlackBerry Device Configuration Setup</source>
         <translation>新黑莓设备配置设置</translation>
@@ -53009,7 +52686,7 @@ references to elements in other files, loops, etc.)</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryDeviceConfigurationWizardFinalPage</name>
+    <name>Qnx</name>
     <message>
         <source>Setup Finished</source>
         <translation>设置完成</translation>
@@ -53020,23 +52697,19 @@ references to elements in other files, loops, etc.)</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryQtVersion</name>
+    <name>Qnx</name>
     <message>
         <source>BlackBerry %1</source>
         <comment>Qt Version is meant for BlackBerry</comment>
         <translation>黑莓 %1</translation>
     </message>
-    <message>
-        <source>BlackBerry</source>
-        <translation>黑莓</translation>
-    </message>
     <message>
         <source>BlackBerry Native SDK:</source>
         <translation>黑莓的原生SDK:</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryRunConfiguration</name>
+    <name>Qnx</name>
     <message>
         <source>%1 on BlackBerry device</source>
         <translation>黑莓设备上的 %1</translation>
@@ -53047,14 +52720,14 @@ references to elements in other files, loops, etc.)</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryRunConfigurationFactory</name>
+    <name>Qnx</name>
     <message>
         <source>%1 on BlackBerry Device</source>
         <translation>黑莓设备上的 %1</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryRunControlFactory</name>
+    <name>Qnx</name>
     <message>
         <source>No active deploy configuration</source>
         <translation>没有激活的部署设置</translation>
@@ -53065,14 +52738,14 @@ references to elements in other files, loops, etc.)</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxAbstractQtVersion</name>
+    <name>Qnx</name>
     <message>
         <source>No SDK path set</source>
         <translation>未设置SDK的路径</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDebugSupport</name>
+    <name>Qnx</name>
     <message>
         <source>Preparing remote side...
 </source>
@@ -53089,42 +52762,19 @@ references to elements in other files, loops, etc.)</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxDeployConfigurationFactory</name>
+    <name>Qnx</name>
     <message>
         <source>Deploy to QNX Device</source>
         <translation>部署到QNX设备</translation>
     </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeviceConfiguration</name>
-    <message>
-        <source>QNX</source>
-        <translation>QNX</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeviceConfigurationFactory</name>
-    <message>
-        <source>QNX Device</source>
-        <translation>QNX 设备</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeviceConfigurationWizard</name>
     <message>
         <source>New QNX Device Configuration Setup</source>
         <translation>新QNX设备配置设置</translation>
     </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeviceConfigurationWizardSetupPage</name>
     <message>
         <source>QNX Device</source>
         <translation>QNX 设备</translation>
     </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxQtVersion</name>
     <message>
         <source>QNX %1</source>
         <extracomment>Qt Version is meant for QNX</extracomment>
@@ -53138,23 +52788,20 @@ references to elements in other files, loops, etc.)</source>
         <source>QNX Software Development Platform:</source>
         <translation>QNX 软件开发平台:</translation>
     </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxRunConfiguration</name>
     <message>
         <source>Path to Qt libraries on device:</source>
         <translation>设备上的Qt库的路径:</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxRunConfigurationFactory</name>
+    <name>Qnx</name>
     <message>
         <source>%1 on QNX Device</source>
         <translation>QNX 设备上的 %1</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::QnxRunControlFactory</name>
+    <name>Qnx</name>
     <message>
         <source>Run on remote QNX device</source>
         <translation>在远程QNX设备上运行</translation>

share/qtcreator/translations/qtcreator_zh_TW.ts

@@ -13806,58 +13806,6 @@ For qmlproject projects, use the importPaths property to add import paths.</sour
         <source>Plain C Project</source>
         <translation>純 C 語言專案</translation>
     </message>
-    <message>
-        <source>Creates an application descriptor file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Application descriptor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>BlackBerry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creates a Qt Gui application for BlackBerry.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>BlackBerry Qt Gui Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creates an Qt5 application descriptor file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Qt5 Application descriptor</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creates an experimental Qt5 Gui application for BlackBerry 10. You need an own Qt5 build for BlackBerry 10 since Qt5 is not provided in the current BlackBerry 10 NDK and is not included in DevAlpha devices.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>BlackBerry Qt5 Gui Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creates an experimental Qt Quick 2 application for BlackBerry 10. You need an own Qt5 build for BlackBerry 10 since Qt5 is not provided in the current BlackBerry 10 NDK and is not included in DevAlpha devices.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>BlackBerry Qt Quick 2 Application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Creates a Qt Quick application for BlackBerry.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>BlackBerry Qt Quick Application</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Plain C++ Project</source>
         <translation>純 C++ 語言專案</translation>
@@ -26836,53 +26784,6 @@ We will try to work around that, but you may experience problems.</source>
         <translation>您尚未設定套件管理員中使用的圖示。圖示要在「專案」─「執行」─「建立套件」─「詳情」中設定。</translation>
     </message>
 </context>
-<context>
-    <name>Madde::Internal::MaemoPublishingUploadSettingsPageFremantleFree</name>
-    <message>
-        <source>Publishing to Fremantle&apos;s &quot;Extras-devel/free&quot; Repository</source>
-        <translation>發佈到 Fremantle 的 &quot;Extras-devel/free&quot; 主目錄</translation>
-    </message>
-    <message>
-        <source>Upload options</source>
-        <translation>上傳選項</translation>
-    </message>
-    <message>
-        <source>Choose a private key file</source>
-        <translation>選擇一個私密金鑰檔</translation>
-    </message>
-    <message>
-        <source>WizardPage</source>
-        <translation>精靈頁面</translation>
-    </message>
-    <message>
-        <source>Upload Settings</source>
-        <translation>上傳設定</translation>
-    </message>
-    <message>
-        <source>Garage account name:</source>
-        <translation>Garage 帳號名稱：</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://garage.maemo.org/account/register.php&quot;&gt;Get an account&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://garage.maemo.org/account/register.php&quot;&gt;取得帳號&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;https://garage.maemo.org/extras-assistant/index.php&quot;&gt;Request upload rights&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;https://garage.maemo.org/extras-assistant/index.php&quot;&gt;請求上傳權限&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Private key file:</source>
-        <translation>私密金鑰檔：</translation>
-    </message>
-    <message>
-        <source>Server address:</source>
-        <translation>伺服器位址：</translation>
-    </message>
-    <message>
-        <source>Target directory on server:</source>
-        <translation>在伺服器上的目標目錄：</translation>
-    </message>
-</context>
 <context>
     <name>Madde::Internal::MaemoPublishingWizardFactoryFremantleFree</name>
     <message>
@@ -32085,7 +31986,7 @@ This option is useful when you want to try your application on devices which don
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BarDescriptorFileImageWizardPage</name>
+    <name>Qnx</name>
     <message>
         <source>WizardPage</source>
         <translation type="unfinished">精靈頁面</translation>
@@ -32132,14 +32033,14 @@ This option is useful when you want to try your application on devices which don
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryDeployConfigurationWidget</name>
+    <name>Qnx</name>
     <message>
         <source>Packages to deploy:</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryDeviceConfigurationWidget</name>
+    <name>Qnx</name>
     <message>
         <source>&amp;Device name:</source>
         <translation type="unfinished"></translation>
@@ -32160,17 +32061,6 @@ This option is useful when you want to try your application on devices which don
         <source>Debug token:</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Private key file:</source>
-        <translation type="unfinished">私密金鑰檔：</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryDeviceConfigurationWizardSetupPage</name>
-    <message>
-        <source>WizardPage</source>
-        <translation type="unfinished">精靈頁面</translation>
-    </message>
     <message>
         <source>The name to identify this configuration:</source>
         <translation type="unfinished">用於辨認此設置的名稱：</translation>
@@ -32179,68 +32069,21 @@ This option is useful when you want to try your application on devices which don
         <source>The device&apos;s host name or IP address:</source>
         <translation type="unfinished">裝置的主機名稱或 IP 位址：</translation>
     </message>
-    <message>
-        <source>Device password:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Device type:</source>
         <translation type="unfinished">裝置型態：</translation>
     </message>
-    <message>
-        <source>Physical device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Simulator</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Debug token:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Connection Details</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>BlackBerry Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryDeviceConfigurationWizardSshKeyPage</name>
-    <message>
-        <source>WizardPage</source>
-        <translation type="unfinished">精靈頁面</translation>
-    </message>
-    <message>
-        <source>Private key file:</source>
-        <translation type="unfinished">私密金鑰檔：</translation>
-    </message>
     <message>
         <source>Public key file:</source>
         <translation type="unfinished">公開金鑰檔：</translation>
     </message>
-    <message>
-        <source>Generate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SSH Key Setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Please select an existing &lt;b&gt;4096&lt;/b&gt;-bit key or click &lt;b&gt;Generate&lt;/b&gt; to create a new one.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Key Generation Failed</source>
         <translation type="unfinished">金鑰產生失敗</translation>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryRunConfigurationWidget</name>
+    <name>Qnx</name>
     <message>
         <source>Device:</source>
         <translation type="unfinished">裝置：</translation>
@@ -32250,13 +32093,6 @@ This option is useful when you want to try your application on devices which don
         <translation type="unfinished">套件：</translation>
     </message>
 </context>
-<context>
-    <name>Qnx::Internal::QnxBaseQtConfigWidget</name>
-    <message>
-        <source>SDK:</source>
-        <translation type="unfinished">SDK：</translation>
-    </message>
-</context>
 <context>
     <name>RemoteLinuxCheckForFreeDiskSpaceStepWidget</name>
     <message>
@@ -35379,356 +35215,23 @@ Do you want to retry?</source>
     </message>
 </context>
 <context>
-    <name>Qnx::Internal::BlackBerryAbstractDeployStep</name>
+    <name>Qnx</name>
     <message>
         <source>Starting: &quot;%1&quot; %2</source>
         <translation type="unfinished">正在啟動：&quot;%1&quot; %2</translation>
     </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryApplicationRunner</name>
-    <message>
-        <source>Launching application failed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot show debug output. Error: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryCreatePackageStep</name>
-    <message>
-        <source>Create BAR packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not find packager command &apos;%1&apos; in the build environment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No packages enabled for deployment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Application descriptor file not specified, please check deployment settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No package specified, please check deployment settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not create build directory &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error preparing application descriptor file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not open &apos;%1&apos; for reading</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not create prepared application descriptor file in &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryCreatePackageStepConfigWidget</name>
-    <message>
-        <source>&lt;b&gt;Create packages&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryCreatePackageStepFactory</name>
-    <message>
-        <source>Create BAR Packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryDeployConfiguration</name>
-    <message>
-        <source>Deploy to BlackBerry Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryDeployConfigurationFactory</name>
-    <message>
-        <source>Deploy to BlackBerry Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryDeployInformation</name>
     <message>
         <source>Enabled</source>
         <translation type="unfinished">已開啟</translation>
     </message>
-    <message>
-        <source>Application descriptor file</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryDeployStep</name>
-    <message>
-        <source>Deploy packages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Could not find deploy command &apos;%1&apos; in the build environment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No hostname specified for device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No packages enabled for deployment</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Package &apos;%1&apos; does not exist. Create the package first.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryDeployStepConfigWidget</name>
     <message>
         <source>&lt;b&gt;Deploy packages&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryDeployStepFactory</name>
-    <message>
-        <source>Deploy Package</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryDeviceConfiguration</name>
-    <message>
-        <source>BlackBerry</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryDeviceConfigurationFactory</name>
-    <message>
-        <source>BlackBerry Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryDeviceConfigurationWizard</name>
-    <message>
-        <source>New BlackBerry Device Configuration Setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Failure to Save Key File</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Failed to create directory: &apos;%1&apos;.</source>
         <translation type="unfinished">建立目錄失敗：&apos;%1&apos;。</translation>
     </message>
-    <message>
-        <source>Private key file already exists: &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Public key file already exists: &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryDeviceConfigurationWizardFinalPage</name>
-    <message>
-        <source>Setup Finished</source>
-        <translation type="unfinished">設定完成</translation>
-    </message>
-    <message>
-        <source>The new device configuration will now be created.</source>
-        <translation type="unfinished">新裝置設置將會被建立。</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryQtVersion</name>
-    <message>
-        <source>BlackBerry %1</source>
-        <comment>Qt Version is meant for BlackBerry</comment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>BlackBerry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>BlackBerry Native SDK:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryRunConfiguration</name>
-    <message>
-        <source>%1 on BlackBerry device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run on BlackBerry device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryRunConfigurationFactory</name>
-    <message>
-        <source>%1 on BlackBerry Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::BlackBerryRunControlFactory</name>
-    <message>
-        <source>No active deploy configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Run on BlackBerry Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxAbstractQtVersion</name>
-    <message>
-        <source>No SDK path set</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDebugSupport</name>
-    <message>
-        <source>Preparing remote side...
-</source>
-        <translation type="unfinished">準備遠端中...
-</translation>
-    </message>
-    <message>
-        <source>The %1 process closed unexpectedly.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Initial setup failed: %1</source>
-        <translation type="unfinished">初始設定失敗：%1</translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeployConfigurationFactory</name>
-    <message>
-        <source>Deploy to QNX Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeviceConfiguration</name>
-    <message>
-        <source>QNX</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeviceConfigurationFactory</name>
-    <message>
-        <source>QNX Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeviceConfigurationWizard</name>
-    <message>
-        <source>New QNX Device Configuration Setup</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxDeviceConfigurationWizardSetupPage</name>
-    <message>
-        <source>QNX Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxQtVersion</name>
-    <message>
-        <source>QNX %1</source>
-        <extracomment>Qt Version is meant for QNX</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QNX</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>QNX Software Development Platform:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxRunConfiguration</name>
-    <message>
-        <source>Path to Qt libraries on device:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxRunConfigurationFactory</name>
-    <message>
-        <source>%1 on QNX Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>Qnx::Internal::QnxRunControlFactory</name>
-    <message>
-        <source>Run on remote QNX device</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QmakeProjectManager::Internal::QmakeKitConfigWidget</name>
-    <message>
-        <source>The mkspec to use when building the project with qmake.&lt;br&gt;This setting is ignored when using other build systems.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Qt mkspec:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QmakeProjectManager::QmakeKitInformation</name>
-    <message>
-        <source>No Qt version set, so mkspec is ignored.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Mkspec not found for Qt version.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>mkspec</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>QmakeProjectManager::QmakeTargetSetupWidget</name>

src/plugins/qnx/qnxanalyzesupport.cpp

@@ -25,6 +25,7 @@
 
 #include "qnxanalyzesupport.h"
 
+#include "qnxtr.h"
 #include "slog2inforunner.h"
 
 #include <projectexplorer/devicesupport/deviceusedportsgatherer.h>
@@ -37,14 +38,13 @@
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 QnxQmlProfilerSupport::QnxQmlProfilerSupport(RunControl *runControl)
     : SimpleTargetRunner(runControl)
 {
     setId("QnxQmlProfilerSupport");
-    appendMessage(tr("Preparing remote side..."), Utils::LogMessageFormat);
+    appendMessage(Tr::tr("Preparing remote side..."), Utils::LogMessageFormat);
 
     auto portsGatherer = new PortsGatherer(runControl);
     addStartDependency(portsGatherer);
@@ -66,5 +66,4 @@ QnxQmlProfilerSupport::QnxQmlProfilerSupport(RunControl *runControl)
     });
 }
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxanalyzesupport.h

@@ -27,16 +27,12 @@
 
 #include <projectexplorer/runcontrol.h>
 
-namespace Qnx {
+namespace Qnx::Internal {
-namespace Internal {
 
 class QnxQmlProfilerSupport : public ProjectExplorer::SimpleTargetRunner
 {
-    Q_DECLARE_TR_FUNCTIONS(Qnx::Internal::QnxQmlProfilerSupport)
-
 public:
     explicit QnxQmlProfilerSupport(ProjectExplorer::RunControl *runControl);
 };
 
-} // namespace Internal
+} // Qnx::Internal
-} // namespace Qnx

src/plugins/qnx/qnxconfiguration.cpp

@@ -24,9 +24,11 @@
 ****************************************************************************/
 
 #include "qnxconfiguration.h"
+
 #include "qnxqtversion.h"
 #include "qnxutils.h"
 #include "qnxtoolchain.h"
+#include "qnxtr.h"
 
 #include "debugger/debuggeritem.h"
 
@@ -147,14 +149,13 @@ bool QnxConfiguration::activate()
 
     if (!isValid()) {
         QString errorMessage
-                = QCoreApplication::translate("Qnx::Internal::QnxConfiguration",
+                = Tr::tr("The following errors occurred while activating the QNX configuration:");
-                                              "The following errors occurred while activating the QNX configuration:");
+
         foreach (const QString &error, validationErrors())
             errorMessage += QLatin1String("\n") + error;
 
         QMessageBox::warning(Core::ICore::dialogParent(),
-                             QCoreApplication::translate("Qnx::Internal::QnxConfiguration",
+                             Tr::tr("Cannot Set Up QNX Configuration"),
-                                                         "Cannot Set Up QNX Configuration"),
                              errorMessage,
                              QMessageBox::Ok);
         return false;
@@ -262,10 +263,7 @@ QVariant QnxConfiguration::createDebugger(const Target &target)
     debugger.setCommand(target.m_debuggerPath);
     debugger.reinitializeFromFile(sysEnv);
     debugger.setAutoDetected(true);
-    debugger.setUnexpandedDisplayName(
+    debugger.setUnexpandedDisplayName(Tr::tr("Debugger for %1 (%2)")
-                QCoreApplication::translate(
-                    "Qnx::Internal::QnxConfiguration",
-                    "Debugger for %1 (%2)")
                 .arg(displayName())
                 .arg(target.shortDescription()));
     return Debugger::DebuggerItemManager::registerDebugger(debugger);
@@ -281,10 +279,7 @@ QnxConfiguration::QnxToolChainMap QnxConfiguration::createToolChain(const Target
         toolChain->setDetection(ToolChain::AutoDetection);
         toolChain->setLanguage(language);
         toolChain->setTargetAbi(target.m_abi);
-        toolChain->setDisplayName(
+        toolChain->setDisplayName(Tr::tr("QCC for %1 (%2)")
-                    QCoreApplication::translate(
-                        "Qnx::Internal::QnxConfiguration",
-                        "QCC for %1 (%2)")
                     .arg(displayName())
                     .arg(target.shortDescription()));
         toolChain->setSdpPath(sdpPath());
@@ -327,10 +322,7 @@ void QnxConfiguration::createKit(const Target &target, const QnxToolChainMap &to
         DeviceTypeKitAspect::setDeviceTypeId(k, Constants::QNX_QNX_OS_TYPE);
         // TODO: Add sysroot?
 
-        k->setUnexpandedDisplayName(
+        k->setUnexpandedDisplayName(Tr::tr("Kit for %1 (%2)")
-                    QCoreApplication::translate(
-                        "Qnx::Internal::QnxConfiguration",
-                        "Kit for %1 (%2)")
                     .arg(displayName())
                     .arg(target.shortDescription()));
 
@@ -355,12 +347,10 @@ QStringList QnxConfiguration::validationErrors() const
 {
     QStringList errorStrings;
     if (m_qccCompiler.isEmpty())
-        errorStrings << QCoreApplication::translate("Qnx::Internal::QnxConfiguration",
+        errorStrings << Tr::tr("- No GCC compiler found.");
-                                                    "- No GCC compiler found.");
 
     if (m_targets.isEmpty())
-        errorStrings << QCoreApplication::translate("Qnx::Internal::QnxConfiguration",
+        errorStrings << Tr::tr("- No targets found.");
-                                                    "- No targets found.");
 
     return errorStrings;
 }

src/plugins/qnx/qnxconfiguration.h

@@ -26,7 +26,6 @@
 #pragma once
 
 #include "qnxconstants.h"
-#include "qnxutils.h"
 #include "qnxversionnumber.h"
 
 #include <utils/fileutils.h>

src/plugins/qnx/qnxconfigurationmanager.cpp

@@ -24,10 +24,13 @@
 ****************************************************************************/
 
 #include "qnxconfigurationmanager.h"
+
 #include "qnxconfiguration.h"
 
 #include <coreplugin/icore.h>
+
 #include <utils/persistentsettings.h>
+#include <utils/qtcassert.h>
 
 using namespace Utils;
 

src/plugins/qnx/qnxdebugsupport.cpp

@@ -26,9 +26,10 @@
 #include "qnxdebugsupport.h"
 
 #include "qnxconstants.h"
-#include "qnxrunconfiguration.h"
-#include "slog2inforunner.h"
 #include "qnxqtversion.h"
+#include "qnxrunconfiguration.h"
+#include "qnxtr.h"
+#include "slog2inforunner.h"
 
 #include <coreplugin/icore.h>
 
@@ -128,7 +129,7 @@ QnxDebugSupport::QnxDebugSupport(RunControl *runControl)
     : DebuggerRunTool(runControl)
 {
     setId("QnxDebugSupport");
-    appendMessage(tr("Preparing remote side..."), LogMessageFormat);
+    appendMessage(Tr::tr("Preparing remote side..."), LogMessageFormat);
 
     setUsePortsGatherer(isCppDebugging(), isQmlDebugging());
 
@@ -159,11 +160,11 @@ public:
     QnxAttachDebugDialog(KitChooser *kitChooser)
         : DeviceProcessesDialog(kitChooser, Core::ICore::dialogParent())
     {
-        auto sourceLabel = new QLabel(QnxDebugSupport::tr("Project source directory:"), this);
+        auto sourceLabel = new QLabel(Tr::tr("Project source directory:"), this);
         m_projectSource = new PathChooser(this);
         m_projectSource->setExpectedKind(PathChooser::ExistingDirectory);
 
-        auto binaryLabel = new QLabel(QnxDebugSupport::tr("Local executable:"), this);
+        auto binaryLabel = new QLabel(Tr::tr("Local executable:"), this);
         m_localExecutable = new PathChooser(this);
         m_localExecutable->setExpectedKind(PathChooser::File);
 
@@ -255,8 +256,8 @@ void QnxAttachDebugSupport::showProcessesDialog()
     debugger->setSymbolFile(localExecutable);
     debugger->setUseCtrlCStub(true);
     debugger->setAttachPid(pid);
-//    setRunControlName(tr("Remote: \"%1\" - Process %2").arg(remoteChannel).arg(m_process.pid));
+//    setRunControlName(Tr::tr("Remote: \"%1\" - Process %2").arg(remoteChannel).arg(m_process.pid));
-    debugger->setRunControlName(tr("Remote QNX process %1").arg(pid));
+    debugger->setRunControlName(Tr::tr("Remote QNX process %1").arg(pid));
     debugger->setSolibSearchPath(searchPaths(kit));
     if (auto qtVersion = dynamic_cast<QnxQtVersion *>(QtSupport::QtKitAspect::qtVersion(kit)))
         debugger->setSysRoot(qtVersion->qnxTarget());

src/plugins/qnx/qnxdeployqtlibrariesdialog.cpp

@@ -27,6 +27,7 @@
 
 #include "qnxconstants.h"
 #include "qnxqtversion.h"
+#include "qnxtr.h"
 
 #include <projectexplorer/deployablefile.h>
 #include <projectexplorer/devicesupport/idevice.h>
@@ -64,7 +65,7 @@ QnxDeployQtLibrariesDialog::QnxDeployQtLibrariesDialog(const IDevice::ConstPtr &
     : QDialog(parent)
     , m_device(device)
 {
-    setWindowTitle(tr("Deploy Qt to QNX Device"));
+    setWindowTitle(Tr::tr("Deploy Qt to QNX Device"));
 
     m_qtLibraryCombo = new QComboBox(this);
     const QList<QtVersion*> qtVersions = QtVersionManager::sortVersions(
@@ -73,7 +74,7 @@ QnxDeployQtLibrariesDialog::QnxDeployQtLibrariesDialog(const IDevice::ConstPtr &
     for (QtVersion *v : qtVersions)
         m_qtLibraryCombo->addItem(v->displayName(), v->uniqueId());
 
-    m_deployButton = new QPushButton(tr("Deploy"), this);
+    m_deployButton = new QPushButton(Tr::tr("Deploy"), this);
     m_deployButton->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
 
     m_basePathLabel = new QLabel(this);
@@ -87,7 +88,7 @@ QnxDeployQtLibrariesDialog::QnxDeployQtLibrariesDialog(const IDevice::ConstPtr &
 
     m_deployLogWindow = new QPlainTextEdit(this);
 
-    m_closeButton = new QPushButton(tr("Close"), this);
+    m_closeButton = new QPushButton(Tr::tr("Close"), this);
 
     m_uploadService = new GenericDirectUploadService(this);
     m_uploadService->setDevice(m_device);
@@ -102,8 +103,8 @@ QnxDeployQtLibrariesDialog::QnxDeployQtLibrariesDialog(const IDevice::ConstPtr &
     horizontalLayout_3->addWidget(m_remoteDirectory);
 
     auto formLayout = new QFormLayout();
-    formLayout->addRow(tr("Qt library to deploy:"), horizontalLayout);
+    formLayout->addRow(Tr::tr("Qt library to deploy:"), horizontalLayout);
-    formLayout->addRow(tr("Remote directory:"), horizontalLayout_3);
+    formLayout->addRow(Tr::tr("Remote directory:"), horizontalLayout_3);
 
     auto horizontalLayout_2 = new QHBoxLayout();
     horizontalLayout_2->addItem(new QSpacerItem(218, 20, QSizePolicy::Expanding, QSizePolicy::Minimum));
@@ -160,7 +161,7 @@ void QnxDeployQtLibrariesDialog::closeEvent(QCloseEvent *event)
     // A disabled Deploy button indicates the upload is still running
     if (!m_deployButton->isEnabled()) {
         const int answer = QMessageBox::question(this, windowTitle(),
-            tr("Closing the dialog will stop the deployment. Are you sure you want to do this?"),
+            Tr::tr("Closing the dialog will stop the deployment. Are you sure you want to do this?"),
             QMessageBox::Yes | QMessageBox::No);
         if (answer == QMessageBox::No)
             event->ignore();
@@ -175,7 +176,7 @@ void QnxDeployQtLibrariesDialog::deployLibraries()
 
     if (m_remoteDirectory->text().isEmpty()) {
         QMessageBox::warning(this, windowTitle(),
-                             tr("Please input a remote directory to deploy to."));
+                             Tr::tr("Please input a remote directory to deploy to."));
         return;
     }
 
@@ -302,7 +303,7 @@ void QnxDeployQtLibrariesDialog::startCheckDirProcess()
 {
     QTC_CHECK(m_state == Inactive);
     m_state = CheckingRemoteDirectory;
-    m_deployLogWindow->appendPlainText(tr("Checking existence of \"%1\"")
+    m_deployLogWindow->appendPlainText(Tr::tr("Checking existence of \"%1\"")
                                            .arg(fullRemoteDirectory()));
     m_checkDirProcess.setCommand({m_device->filePath("test"),
                                   {"-d", fullRemoteDirectory()}});
@@ -313,7 +314,7 @@ void QnxDeployQtLibrariesDialog::startRemoveDirProcess()
 {
     QTC_CHECK(m_state == CheckingRemoteDirectory);
     m_state = RemovingRemoteDirectory;
-    m_deployLogWindow->appendPlainText(tr("Removing \"%1\"").arg(fullRemoteDirectory()));
+    m_deployLogWindow->appendPlainText(Tr::tr("Removing \"%1\"").arg(fullRemoteDirectory()));
     m_removeDirProcess.setCommand({m_device->filePath("rm"),
                                   {"-rf", fullRemoteDirectory()}});
     m_removeDirProcess.start();
@@ -327,7 +328,7 @@ void QnxDeployQtLibrariesDialog::handleCheckDirDone()
 
     if (m_checkDirProcess.exitCode() == 0) { // Directory exists
         const int answer = QMessageBox::question(this, windowTitle(),
-            tr("The remote directory \"%1\" already exists.\n"
+            Tr::tr("The remote directory \"%1\" already exists.\n"
                "Deploying to that directory will remove any files already present.\n\n"
                "Are you sure you want to continue?").arg(fullRemoteDirectory()),
                QMessageBox::Yes | QMessageBox::No);
@@ -356,7 +357,7 @@ bool QnxDeployQtLibrariesDialog::handleError(const QtcProcess &process)
     if (process.result() == ProcessResult::FinishedWithSuccess)
         return false;
 
-    m_deployLogWindow->appendPlainText(tr("Connection failed: %1").arg(process.errorString()));
+    m_deployLogWindow->appendPlainText(Tr::tr("Connection failed: %1").arg(process.errorString()));
     handleUploadFinished();
     return true;
 }

src/plugins/qnx/qnxdevice.cpp

@@ -29,8 +29,9 @@
 #include "qnxdevicetester.h"
 #include "qnxdeviceprocesslist.h"
 #include "qnxdeviceprocesssignaloperation.h"
-#include "qnxdeployqtlibrariesdialog.h"
 #include "qnxdevicewizard.h"
+#include "qnxtr.h"
+#include "qnxdeployqtlibrariesdialog.h"
 
 #include <remotelinux/sshprocessinterface.h>
 
@@ -107,11 +108,11 @@ const char QnxVersionKey[] = "QnxVersion";
 
 QnxDevice::QnxDevice()
 {
-    setDisplayType(tr("QNX"));
+    setDisplayType(Tr::tr("QNX"));
-    setDefaultDisplayName(tr("QNX Device"));
+    setDefaultDisplayName(Tr::tr("QNX Device"));
     setOsType(OsTypeOtherUnix);
 
-    addDeviceAction({tr("Deploy Qt libraries..."), [](const IDevice::Ptr &device, QWidget *parent) {
+    addDeviceAction({Tr::tr("Deploy Qt libraries..."), [](const IDevice::Ptr &device, QWidget *parent) {
         QnxDeployQtLibrariesDialog dialog(device, parent);
         dialog.exec();
     }});
@@ -195,7 +196,7 @@ DeviceProcessSignalOperation::Ptr QnxDevice::signalOperation() const
 
 QnxDeviceFactory::QnxDeviceFactory() : IDeviceFactory(Constants::QNX_QNX_OS_TYPE)
 {
-    setDisplayName(QnxDevice::tr("QNX Device"));
+    setDisplayName(Tr::tr("QNX Device"));
     setCombinedIcon(":/qnx/images/qnxdevicesmall.png",
                     ":/qnx/images/qnxdevice.png");
     setConstructionFunction(&QnxDevice::create);

src/plugins/qnx/qnxdevice.h

@@ -34,8 +34,6 @@ namespace Internal {
 
 class QnxDevice final : public RemoteLinux::LinuxDevice
 {
-    Q_DECLARE_TR_FUNCTIONS(Qnx::Internal::QnxDevice)
-
 public:
     using Ptr = QSharedPointer<QnxDevice>;
     using ConstPtr = QSharedPointer<const QnxDevice>;

src/plugins/qnx/qnxdevicetester.cpp

@@ -25,6 +25,7 @@
 
 #include "qnxdevicetester.h"
 #include "qnxdevice.h"
+#include "qnxtr.h"
 
 #include <utils/qtcassert.h>
 
@@ -93,7 +94,7 @@ void QnxDeviceTester::handleGenericTestFinished(TestResult result)
     }
 
     m_state = VarRunTest;
-    emit progressMessage(tr("Checking that files can be created in /var/run..."));
+    emit progressMessage(Tr::tr("Checking that files can be created in /var/run..."));
     const CommandLine cmd {m_deviceConfiguration->filePath("/bin/sh"),
         {"-c", QLatin1String("rm %1 > /dev/null 2>&1; echo ABC > %1 && rm %1")
                     .arg("/var/run/qtc_xxxx.pid")}};
@@ -114,13 +115,13 @@ void QnxDeviceTester::handleProcessDone()
 void QnxDeviceTester::handleVarRunDone()
 {
     if (m_process.result() == ProcessResult::FinishedWithSuccess) {
-        emit progressMessage(tr("Files can be created in /var/run.") + '\n');
+        emit progressMessage(Tr::tr("Files can be created in /var/run.") + '\n');
     } else {
         m_result = TestFailure;
         const QString message = m_process.result() == ProcessResult::StartFailed
-                ? tr("An error occurred while checking that files can be created in /var/run.")
+                ? Tr::tr("An error occurred while checking that files can be created in /var/run.")
                   + '\n' + m_process.errorString()
-                : tr("Files cannot be created in /var/run.");
+                : Tr::tr("Files cannot be created in /var/run.");
         emit errorMessage(message + '\n');
     }
 
@@ -134,13 +135,13 @@ void QnxDeviceTester::handleCommandDone()
 {
     const QString command = m_commandsToTest[m_currentCommandIndex];
     if (m_process.result() == ProcessResult::FinishedWithSuccess) {
-        emit progressMessage(tr("%1 found.").arg(command) + '\n');
+        emit progressMessage(Tr::tr("%1 found.").arg(command) + '\n');
     } else {
         m_result = TestFailure;
         const QString message = m_process.result() == ProcessResult::StartFailed
-                ? tr("An error occurred while checking for %1.").arg(command)
+                ? Tr::tr("An error occurred while checking for %1.").arg(command)
                   + '\n' + m_process.errorString()
-                : tr("%1 not found.").arg(command);
+                : Tr::tr("%1 not found.").arg(command);
         emit errorMessage(message + '\n');
     }
 
@@ -158,7 +159,7 @@ void QnxDeviceTester::testNextCommand()
     }
 
     const QString command = m_commandsToTest[m_currentCommandIndex];
-    emit progressMessage(tr("Checking for %1...").arg(command));
+    emit progressMessage(Tr::tr("Checking for %1...").arg(command));
     m_process.setCommand({m_deviceConfiguration->filePath("command"), {"-v", command}});
     m_process.start();
 }

src/plugins/qnx/qnxdevicewizard.cpp

@@ -26,6 +26,7 @@
 #include "qnxdevicewizard.h"
 
 #include "qnxconstants.h"
+#include "qnxtr.h"
 
 #include <projectexplorer/devicesupport/sshparameters.h>
 #include <remotelinux/genericlinuxdeviceconfigurationwizardpages.h>
@@ -39,7 +40,7 @@ namespace Internal {
 QnxDeviceWizard::QnxDeviceWizard(QWidget *parent) :
     Utils::Wizard(parent)
 {
-    setWindowTitle(tr("New QNX Device Configuration Setup"));
+    setWindowTitle(Tr::tr("New QNX Device Configuration Setup"));
 
     m_setupPage = new RemoteLinux::GenericLinuxDeviceConfigurationWizardSetupPage(this);
     m_keyDeploymentPage

src/plugins/qnx/qnxplugin.cpp

@@ -34,7 +34,7 @@
 #include "qnxrunconfiguration.h"
 #include "qnxsettingspage.h"
 #include "qnxtoolchain.h"
-#include "qnxutils.h"
+#include "qnxtr.h"
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -93,8 +93,7 @@ public:
     QnxDeployConfigurationFactory()
     {
         setConfigBaseId(Constants::QNX_QNX_DEPLOYCONFIGURATION_ID);
-        setDefaultDisplayName(QCoreApplication::translate("Qnx::Internal::QnxDeployConfiguration",
+        setDefaultDisplayName(Tr::tr("Deploy to QNX Device"));
-                                                          "Deploy to QNX Device"));
         addSupportedTargetDeviceType(Constants::QNX_QNX_OS_TYPE);
         setUseDeploymentDataView();
 
@@ -114,7 +113,7 @@ public:
     void updateDebuggerActions();
 
     QAction *m_debugSeparator = nullptr;
-    QAction m_attachToQnxApplication{QnxPlugin::tr("Attach to remote QNX application..."), nullptr};
+    QAction m_attachToQnxApplication{Tr::tr("Attach to remote QNX application..."), nullptr};
 
     QnxConfigurationManager configurationFactory;
     QnxQtVersionFactory qtVersionFactory;

src/plugins/qnx/qnxqtversion.cpp

@@ -26,6 +26,7 @@
 #include "qnxqtversion.h"
 
 #include "qnxconstants.h"
+#include "qnxtr.h"
 #include "qnxutils.h"
 
 #include <coreplugin/featureprovider.h>
@@ -80,8 +81,7 @@ QnxQtVersion::QnxQtVersion() = default;
 QString QnxQtVersion::description() const
 {
     //: Qt Version is meant for QNX
-    return QCoreApplication::translate("Qnx::Internal::QnxQtVersion", "QNX %1")
+    return Tr::tr("QNX %1").arg(QnxUtils::cpuDirShortDescription(cpuDir()));
-            .arg(QnxUtils::cpuDirShortDescription(cpuDir()));
 }
 
 QSet<Id> QnxQtVersion::availableFeatures() const
@@ -179,8 +179,7 @@ bool QnxQtVersion::isValid() const
 QString QnxQtVersion::invalidReason() const
 {
     if (sdpPath().isEmpty())
-        return QCoreApplication::translate("Qnx::Internal::QnxQtVersion",
+        return Tr::tr("No SDP path was set up.");
-                                           "No SDP path was set up.");
     return QtSupport::QtVersion::invalidReason();
 }
 

src/plugins/qnx/qnxrunconfiguration.cpp

@@ -26,6 +26,7 @@
 #include "qnxrunconfiguration.h"
 
 #include "qnxconstants.h"
+#include "qnxtr.h"
 
 #include <projectexplorer/buildsystem.h>
 #include <projectexplorer/deployablefile.h>
@@ -48,14 +49,14 @@ QnxRunConfiguration::QnxRunConfiguration(Target *target, Id id)
     : RunConfiguration(target, id)
 {
     auto exeAspect = addAspect<ExecutableAspect>(target, ExecutableAspect::RunDevice);
-    exeAspect->setLabelText(tr("Executable on device:"));
+    exeAspect->setLabelText(Tr::tr("Executable on device:"));
-    exeAspect->setPlaceHolderText(tr("Remote path not set"));
+    exeAspect->setPlaceHolderText(Tr::tr("Remote path not set"));
     exeAspect->makeOverridable("RemoteLinux.RunConfig.AlternateRemoteExecutable",
                                "RemoteLinux.RunConfig.UseAlternateRemoteExecutable");
     exeAspect->setHistoryCompleter("RemoteLinux.AlternateExecutable.History");
 
     auto symbolsAspect = addAspect<SymbolFileAspect>();
-    symbolsAspect->setLabelText(tr("Executable on host:"));
+    symbolsAspect->setLabelText(Tr::tr("Executable on host:"));
     symbolsAspect->setDisplayStyle(SymbolFileAspect::LabelDisplay);
 
     auto envAspect = addAspect<RemoteLinuxEnvironmentAspect>(target);
@@ -66,7 +67,7 @@ QnxRunConfiguration::QnxRunConfiguration(Target *target, Id id)
 
     auto libAspect = addAspect<StringAspect>();
     libAspect->setSettingsKey("Qt4ProjectManager.QnxRunConfiguration.QtLibPath");
-    libAspect->setLabelText(tr("Path to Qt libraries on device"));
+    libAspect->setLabelText(Tr::tr("Path to Qt libraries on device"));
     libAspect->setDisplayStyle(StringAspect::LineEditDisplay);
 
     setUpdater([this, target, exeAspect, symbolsAspect] {

src/plugins/qnx/qnxsettingspage.cpp

@@ -27,6 +27,7 @@
 
 #include "qnxconfiguration.h"
 #include "qnxconfigurationmanager.h"
+#include "qnxtr.h"
 
 #include <coreplugin/icore.h>
 
@@ -108,25 +109,25 @@ QnxSettingsWidget::QnxSettingsWidget() :
     m_configsCombo = new QComboBox(this);
 
     m_generateKitsCheckBox = new QCheckBox(this);
-    m_generateKitsCheckBox->setText(tr("Generate kits"));
+    m_generateKitsCheckBox->setText(Tr::tr("Generate kits"));
 
     m_groupBox = new QGroupBox(this);
     m_groupBox->setMinimumSize(QSize(0, 0));
-    m_groupBox->setTitle(tr("Configuration Information:"));
+    m_groupBox->setTitle(Tr::tr("Configuration Information:"));
 
     m_configName = new QLabel(m_groupBox);
     m_configVersion = new QLabel(m_groupBox);
     m_configTarget = new QLabel(m_groupBox);
     m_configHost = new QLabel(m_groupBox);
 
-    m_addButton = new QPushButton(tr("Add..."));
+    m_addButton = new QPushButton(Tr::tr("Add..."));
-    m_removeButton = new QPushButton(tr("Remove"));
+    m_removeButton = new QPushButton(Tr::tr("Remove"));
 
     auto verticalLayout_3 = new QVBoxLayout();
-    verticalLayout_3->addWidget(new QLabel(tr("Name:")));
+    verticalLayout_3->addWidget(new QLabel(Tr::tr("Name:")));
-    verticalLayout_3->addWidget(new QLabel(tr("Version:")));
+    verticalLayout_3->addWidget(new QLabel(Tr::tr("Version:")));
-    verticalLayout_3->addWidget(new QLabel(tr("Host:")));
+    verticalLayout_3->addWidget(new QLabel(Tr::tr("Host:")));
-    verticalLayout_3->addWidget(new QLabel(tr("Target:")));
+    verticalLayout_3->addWidget(new QLabel(Tr::tr("Target:")));
     verticalLayout_3->addItem(new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding));
 
     auto verticalLayout_4 = new QVBoxLayout();
@@ -183,7 +184,7 @@ void QnxSettingsWidget::addConfiguration()
     else
         filter = "*.sh file";
 
-    const FilePath envFile = FileUtils::getOpenFilePath(this, tr("Select QNX Environment File"),
+    const FilePath envFile = FileUtils::getOpenFilePath(this, Tr::tr("Select QNX Environment File"),
                                                         {}, filter);
     if (envFile.isEmpty())
         return;
@@ -192,8 +193,8 @@ void QnxSettingsWidget::addConfiguration()
     if (m_qnxConfigManager->configurations().contains(config)
             || !config->isValid()) {
         QMessageBox::warning(Core::ICore::dialogParent(),
-                             tr("Warning"),
+                             Tr::tr("Warning"),
-                             tr("Configuration already exists or is invalid."));
+                             Tr::tr("Configuration already exists or is invalid."));
         delete config;
         return;
     }
@@ -214,8 +215,8 @@ void QnxSettingsWidget::removeConfiguration()
 
     QMessageBox::StandardButton button =
             QMessageBox::question(Core::ICore::dialogParent(),
-                                  tr("Remove QNX Configuration"),
+                                  Tr::tr("Remove QNX Configuration"),
-                                  tr("Are you sure you want to remove:\n %1?").arg(config->displayName()),
+                                  Tr::tr("Are you sure you want to remove:\n %1?").arg(config->displayName()),
                                   QMessageBox::Yes | QMessageBox::No);
 
     if (button == QMessageBox::Yes) {
@@ -319,7 +320,7 @@ void QnxSettingsWidget::apply()
 QnxSettingsPage::QnxSettingsPage()
 {
     setId("DD.Qnx Configuration");
-    setDisplayName(QnxSettingsWidget::tr("QNX"));
+    setDisplayName(Tr::tr("QNX"));
     setCategory(ProjectExplorer::Constants::DEVICE_SETTINGS_CATEGORY);
     setWidgetCreator([] { return new QnxSettingsWidget; });
 }

src/plugins/qnx/qnxtoolchain.cpp

@@ -24,9 +24,11 @@
 ****************************************************************************/
 
 #include "qnxtoolchain.h"
+
 #include "qnxconfiguration.h"
 #include "qnxconfigurationmanager.h"
 #include "qnxconstants.h"
+#include "qnxtr.h"
 #include "qnxutils.h"
 
 #include <projectexplorer/abiwidget.h>
@@ -107,7 +109,7 @@ QnxToolChain::QnxToolChain()
     : GccToolChain(Constants::QNX_TOOLCHAIN_ID)
 {
     setOptionsReinterpreter(&reinterpretOptions);
-    setTypeDisplayName(tr("QCC"));
+    setTypeDisplayName(Tr::tr("QCC"));
 }
 
 std::unique_ptr<ToolChainConfigWidget> QnxToolChain::createConfigurationWidget()
@@ -211,7 +213,7 @@ bool QnxToolChain::operator ==(const ToolChain &other) const
 
 QnxToolChainFactory::QnxToolChainFactory()
 {
-    setDisplayName(QnxToolChain::tr("QCC"));
+    setDisplayName(Tr::tr("QCC"));
     setSupportedToolChainType(Constants::QNX_TOOLCHAIN_ID);
     setSupportedLanguages({ProjectExplorer::Constants::C_LANGUAGE_ID,
                            ProjectExplorer::Constants::CXX_LANGUAGE_ID});
@@ -256,10 +258,10 @@ QnxToolChainConfigWidget::QnxToolChainConfigWidget(QnxToolChain *tc)
     m_abiWidget->setAbis(abiList, tc->targetAbi());
     m_abiWidget->setEnabled(!tc->isAutoDetected() && !abiList.isEmpty());
 
-    m_mainLayout->addRow(tr("&Compiler path:"), m_compilerCommand);
+    m_mainLayout->addRow(Tr::tr("&Compiler path:"), m_compilerCommand);
     //: SDP refers to 'Software Development Platform'.
-    m_mainLayout->addRow(tr("SDP path:"), m_sdpPath);
+    m_mainLayout->addRow(Tr::tr("SDP path:"), m_sdpPath);
-    m_mainLayout->addRow(tr("&ABI:"), m_abiWidget);
+    m_mainLayout->addRow(Tr::tr("&ABI:"), m_abiWidget);
 
     connect(m_compilerCommand, &PathChooser::rawPathChanged, this, &ToolChainConfigWidget::dirty);
     connect(m_sdpPath, &PathChooser::rawPathChanged,

src/plugins/qnx/qnxtoolchain.h

@@ -36,8 +36,6 @@ namespace Internal {
 
 class QnxToolChain : public ProjectExplorer::GccToolChain
 {
-    Q_DECLARE_TR_FUNCTIONS(Qnx::Internal::QnxToolChain)
-
 public:
     QnxToolChain();
 

src/plugins/qnx/qnxutils.cpp

@@ -24,7 +24,6 @@
 ****************************************************************************/
 
 #include "qnxutils.h"
-#include "qnxqtversion.h"
 
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>

src/plugins/qnx/slog2inforunner.cpp

@@ -26,7 +26,7 @@
 #include "slog2inforunner.h"
 
 #include "qnxdevice.h"
-#include "qnxrunconfiguration.h"
+#include "qnxtr.h"
 
 #include <projectexplorer/runconfigurationaspects.h>
 
@@ -65,7 +65,7 @@ Slog2InfoRunner::Slog2InfoRunner(RunControl *runControl)
 
 void Slog2InfoRunner::printMissingWarning()
 {
-    appendMessage(tr("Warning: \"slog2info\" is not found on the device, debug output not available."), ErrorMessageFormat);
+    appendMessage(Tr::tr("Warning: \"slog2info\" is not found on the device, debug output not available."), ErrorMessageFormat);
 }
 
 void Slog2InfoRunner::start()
@@ -199,7 +199,7 @@ void Slog2InfoRunner::handleLogDone()
     if (m_logProcess->error() == QProcess::UnknownError)
         return;
 
-    appendMessage(tr("Cannot show slog2info output. Error: %1")
+    appendMessage(Tr::tr("Cannot show slog2info output. Error: %1")
                   .arg(m_logProcess->errorString()), Utils::StdErrFormat);
 }