Perforce: Tr::tr

Change-Id: Id8f4d5fbd3f20ec750bbfbbac2662e5b3a79ecd3
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>

share/qtcreator/translations/qtcreator_cs.ts

@@ -8718,34 +8718,7 @@ ve svém .pro souboru.</translation>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal</name>
+    <name>::Perforce</name>
-    <message>
-        <source>No executable specified</source>
-        <translation type="obsolete">Nebyl zadán žádný spustitelný soubor</translation>
-    </message>
-    <message>
-        <source>Unable to launch &quot;%1&quot;: %2</source>
-        <translation type="obsolete">&quot;%1&quot; se nepodařilo spustit: %2</translation>
-    </message>
-    <message>
-        <source>&quot;%1&quot; timed out after %2ms.</source>
-        <translation type="obsolete">Překročení času při provedení &quot;%1&quot;(%2ms).</translation>
-    </message>
-    <message>
-        <source>&quot;%1&quot; crashed.</source>
-        <translation type="obsolete">&quot;%1&quot; spadl.</translation>
-    </message>
-    <message>
-        <source>&quot;%1&quot; terminated with exit code %2: %3</source>
-        <translation type="obsolete">Proces &apos;%1&quot; byl ukončen (vrácená hodnota %2): %3</translation>
-    </message>
-    <message>
-        <source>The client does not seem to contain any mapped files.</source>
-        <translation type="obsolete">&apos;Perforce&apos; klient zřejmě neobsahuje žádná přiřazení souborů.</translation>
-    </message>
-</context>
-<context>
-    <name>Perforce::Internal::ChangeNumberDialog</name>
     <message>
         <source>Change Number</source>
         <translation>Číslo změny</translation>
@@ -8754,9 +8727,6 @@ ve svém .pro souboru.</translation>
         <source>Change Number:</source>
         <translation>Číslo změny:</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PendingChangesDialog</name>
     <message>
         <source>P4 Pending Changes</source>
         <translation>P4 nevyřízené změny</translation>
@@ -8773,9 +8743,6 @@ ve svém .pro souboru.</translation>
         <source>Change %1: %2</source>
         <translation>Změna %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforcePlugin</name>
     <message>
         <source>&amp;Perforce</source>
         <translation>&amp;Perforce</translation>
@@ -8928,10 +8895,6 @@ ve svém .pro souboru.</translation>
         <source>Update All</source>
         <translation>Aktualizovat vše</translation>
     </message>
-    <message>
-        <source>Submit</source>
-        <translation>Odevzdat (submit)</translation>
-    </message>
     <message>
         <source>Diff Selected Files</source>
         <translation type="obsolete">Diff pro vybrané soubory</translation>
@@ -9168,16 +9131,10 @@ ve svém .pro souboru.</translation>
         <source>Error running &quot;where&quot; on %1: The file is not mapped</source>
         <translation type="obsolete">Chyba při provedení &quot;where&quot; na %1: Soubor není přiřazen</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceSubmitEditor</name>
     <message>
         <source>Perforce Submit</source>
         <translation>Odevzdání &apos;Perforce&apos; (submit)</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PromptDialog</name>
     <message>
         <source>Perforce Prompt</source>
         <translation>Výzva &apos;Perforce&apos;</translation>
@@ -9186,9 +9143,6 @@ ve svém .pro souboru.</translation>
         <source>OK</source>
         <translation>OK</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPage</name>
     <message>
         <source>P4 Command:</source>
         <translation type="obsolete">Příkaz P4:</translation>
@@ -9273,9 +9227,6 @@ ve svém .pro souboru.</translation>
         <source>Automatically open files when editing</source>
         <translation>Soubory při úpravách otevřít automaticky</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPageWidget</name>
     <message>
         <source>Testing...</source>
         <translation>Běží zkouška...</translation>
@@ -9292,13 +9243,6 @@ ve svém .pro souboru.</translation>
         <source>Perforce Command</source>
         <translation>Příkaz Perforce</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SubmitPanel</name>
-    <message>
-        <source>Submit</source>
-        <translation>Odevzdat (submit)</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation>Změna:</translation>
@@ -23737,7 +23681,7 @@ Proces Pdb po určité době od úspěšného spuštění spadl.</translation>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceChecker</name>
+    <name>::Perforce</name>
     <message>
         <source>No executable specified</source>
         <translation>Nebyl zadán žádný spustitelný soubor</translation>
@@ -23771,9 +23715,6 @@ Proces Pdb po určité době od úspěšného spuštění spadl.</translation>
         <source>The repository &quot;%1&quot; does not exist.</source>
         <translation>Skladiště &quot;%1&quot; neexistuje.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceEditor</name>
     <message>
         <source>Annotate change list &quot;%1&quot;</source>
         <translation>Opatřit anotacemi seznam se změnami &quot;%1&quot;</translation>
@@ -33372,7 +33313,7 @@ když bude zavolán mimo git bash.</translation>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceDiffParameterWidget</name>
+    <name>::Perforce</name>
     <message>
         <source>Ignore whitespace</source>
         <translation>Nevšímat si bílých znaků</translation>
@@ -48731,7 +48672,7 @@ Zasáhnutí do modulu nebo nastavení bodů přerušení podle souboru, a oček
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceVersionControl</name>
+    <name>::Perforce</name>
     <message>
         <source>&amp;Edit (%1)</source>
         <translation type="obsolete">&amp;Upravit (%1)</translation>

share/qtcreator/translations/qtcreator_da.ts

@@ -20669,7 +20669,7 @@ Fejl: %5</translation>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::ChangeNumberDialog</name>
+    <name>::Perforce</name>
     <message>
         <source>Change Number</source>
         <translation>Skift nummer</translation>
@@ -20678,9 +20678,6 @@ Fejl: %5</translation>
         <source>Change Number:</source>
         <translation>Skift nummer:</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PendingChangesDialog</name>
     <message>
         <source>P4 Pending Changes</source>
         <translation>P4 afventende ændringer</translation>
@@ -20697,9 +20694,6 @@ Fejl: %5</translation>
         <source>Change %1: %2</source>
         <translation>Skift %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceChecker</name>
     <message>
         <source>No executable specified</source>
         <translation>Ingen eksekverbar angivet</translation>
@@ -20733,23 +20727,14 @@ Fejl: %5</translation>
         <source>The repository &quot;%1&quot; does not exist.</source>
         <translation>Repository&apos;et &quot;%1&quot; findes ikke.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceDiffConfig</name>
     <message>
         <source>Ignore Whitespace</source>
         <translation>Ignorer blanktegn</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceEditorWidget</name>
     <message>
         <source>Annotate change list &quot;%1&quot;</source>
         <translation>Annotate ændringslisten &quot;%1&quot;</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforcePlugin</name>
     <message>
         <source>&amp;Perforce</source>
         <translation>&amp;Perforce</translation>
@@ -20962,10 +20947,6 @@ Fejl: %5</translation>
         <source>Filelog...</source>
         <translation>Filelog...</translation>
     </message>
-    <message>
-        <source>Submit</source>
-        <translation>Indsend</translation>
-    </message>
     <message>
         <source>Diff &amp;Selected Files</source>
         <translation>Diff &amp;valgte filer</translation>
@@ -21104,16 +21085,10 @@ Fejl: %5</translation>
         <source>Perforce: Unable to determine the repository: %1</source>
         <translation>Perforce: Kunne ikke beslutte repository&apos;et: %1</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceSubmitEditor</name>
     <message>
         <source>Perforce Submit</source>
         <translation>Perforce submit</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceVersionControl</name>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Rediger</translation>
@@ -21122,9 +21097,6 @@ Fejl: %5</translation>
         <source>&amp;Hijack</source>
         <translation>&amp;Hijack</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PromptDialog</name>
     <message>
         <source>Perforce Prompt</source>
         <translation>Perforce-prompt</translation>
@@ -21133,9 +21105,6 @@ Fejl: %5</translation>
         <source>OK</source>
         <translation>OK</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPage</name>
     <message>
         <source>Configuration</source>
         <translation>Konfiguration</translation>
@@ -21192,9 +21161,6 @@ Fejl: %5</translation>
         <source>Perforce</source>
         <translation>Perforce</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPageWidget</name>
     <message>
         <source>Perforce Command</source>
         <translation>Perforce-kommando</translation>
@@ -21207,13 +21173,6 @@ Fejl: %5</translation>
         <source>Test succeeded (%1).</source>
         <translation>Test lykkedes (%1).</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SubmitPanel</name>
-    <message>
-        <source>Submit</source>
-        <translation>Indsend</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation>Ændring:</translation>

share/qtcreator/translations/qtcreator_de.ts

@@ -9576,7 +9576,7 @@ Leer lassen, um das Dateisystem zu durchsuchen.</translation>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::ChangeNumberDialog</name>
+    <name>::Perforce</name>
     <message>
         <source>Change Number</source>
         <translation>Change-Nummer</translation>
@@ -9585,9 +9585,6 @@ Leer lassen, um das Dateisystem zu durchsuchen.</translation>
         <source>Change Number:</source>
         <translation>Change-Nummer:</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PendingChangesDialog</name>
     <message>
         <source>P4 Pending Changes</source>
         <translation>P4 Ausstehende Changes</translation>
@@ -9604,9 +9601,6 @@ Leer lassen, um das Dateisystem zu durchsuchen.</translation>
         <source>Change %1: %2</source>
         <translation>Change %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforcePlugin</name>
     <message>
         <source>&amp;Perforce</source>
         <translation>&amp;Perforce</translation>
@@ -9831,10 +9825,6 @@ Leer lassen, um das Dateisystem zu durchsuchen.</translation>
         <source>&amp;Hijack</source>
         <translation>&amp;Hijack</translation>
     </message>
-    <message>
-        <source>Submit</source>
-        <translation>Submit</translation>
-    </message>
     <message>
         <source>p4 revert</source>
         <translation>Rückgängig machen</translation>
@@ -9940,16 +9930,10 @@ Leer lassen, um das Dateisystem zu durchsuchen.</translation>
         <source>Could not submit the change, because your workspace was out of date. Created a pending submit instead.</source>
         <translation>Der Submit-Vorgang konnte nicht ausgeführt werden, weil Ihr Arbeitsbereich nicht auf dem aktuellsten Stand ist. Es wurde ein ausstehender Submit-Vorgang erzeugt.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceSubmitEditor</name>
     <message>
         <source>Perforce Submit</source>
         <translation>Perforce Submit</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPage</name>
     <message>
         <source>Perforce Command</source>
         <translation>Perforce-Kommando</translation>
@@ -10018,13 +10002,6 @@ Leer lassen, um das Dateisystem zu durchsuchen.</translation>
         <source>Automatically open files when editing</source>
         <translation>Dateien bei Bearbeitung automatisch anfordern</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SubmitPanel</name>
-    <message>
-        <source>Submit</source>
-        <translation>Submit</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation>Änderung:</translation>
@@ -13386,7 +13363,7 @@ Was möchten Sie tun?</translation>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceChecker</name>
+    <name>::Perforce</name>
     <message>
         <source>No executable specified</source>
         <translation>Es wurde keine ausführbare Datei angegeben</translation>
@@ -33927,7 +33904,7 @@ Benutzen Sie dies nur für Prototypen. Sie können damit keine vollständige Anw
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceEditorWidget</name>
+    <name>::Perforce</name>
     <message>
         <source>Annotate change list &quot;%1&quot;</source>
         <translation>Annotation der Change-Liste &quot;%1&quot;</translation>
@@ -39930,7 +39907,7 @@ Ablaufdatum: %3</translation>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceDiffConfig</name>
+    <name>::Perforce</name>
     <message>
         <source>Ignore Whitespace</source>
         <translation>Leerzeichen ignorieren</translation>

share/qtcreator/translations/qtcreator_es.ts

@@ -6119,7 +6119,7 @@ en su archivo .pro.</translation>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal</name>
+    <name>::Perforce</name>
     <message>
         <source>No executable specified</source>
         <translation>No se especificó ejecutable</translation>
@@ -6144,9 +6144,6 @@ en su archivo .pro.</translation>
         <source>The client does not seem to contain any mapped files.</source>
         <translation>El cliente no parece contener ningún archivo mapeado.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::ChangeNumberDialog</name>
     <message>
         <source>Change Number</source>
         <translation>Modificar número</translation>
@@ -6156,9 +6153,6 @@ en su archivo .pro.</translation>
         <source>Change Number:</source>
         <translation>Modificar número:</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PendingChangesDialog</name>
     <message>
         <source>P4 Pending Changes</source>
         <translation>Modificaciones pendientes de P4</translation>
@@ -6177,9 +6171,6 @@ en su archivo .pro.</translation>
         <source>Change %1: %2</source>
         <translation>Modificar %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceOutputWindow</name>
     <message>
         <source>Perforce Output</source>
         <translation type="obsolete">Salida de Perforce</translation>
@@ -6188,9 +6179,6 @@ en su archivo .pro.</translation>
         <source>Diff</source>
         <translation type="obsolete">Diferencias</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforcePlugin</name>
     <message>
         <source>&amp;Perforce</source>
         <translation>&amp;Perforce</translation>
@@ -6473,16 +6461,10 @@ en su archivo .pro.</translation>
         <source>Error running &quot;where&quot; on %1: The file is not mapped</source>
         <translation>Error ejecutando &quot;where&quot; en %1: El archivo no esta mapeado</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceSubmitEditor</name>
     <message>
         <source>Perforce Submit</source>
         <translation>Envío a Perforce</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PromptDialog</name>
     <message>
         <source>Perforce Prompt</source>
         <translation>Interacción con Perforce</translation>
@@ -6492,9 +6474,6 @@ en su archivo .pro.</translation>
         <source>OK</source>
         <translation>Ok</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPage</name>
     <message>
         <source>P4 Command:</source>
         <translation>Comando P4:</translation>
@@ -6537,9 +6516,6 @@ en su archivo .pro.</translation>
         <source>Prompt to submit</source>
         <translation type="unfinished">Preguntar antes de enviar</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPageWidget</name>
     <message>
         <source>Testing...</source>
         <translation>Probando...</translation>
@@ -6552,13 +6528,6 @@ en su archivo .pro.</translation>
         <source>Perforce Command</source>
         <translation>Comando Perforce</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SubmitPanel</name>
-    <message>
-        <source>Submit</source>
-        <translation>Enviar</translation>
-    </message>
     <message>
         <location/>
         <source>Change:</source>

share/qtcreator/translations/qtcreator_fr.ts

@@ -9337,34 +9337,7 @@ dans votre fichier .pro.</translation>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal</name>
+    <name>::Perforce</name>
-    <message>
-        <source>No executable specified</source>
-        <translation type="obsolete">Aucun exécutable spécifié</translation>
-    </message>
-    <message>
-        <source>Unable to launch &quot;%1&quot;: %2</source>
-        <translation type="obsolete">Impossible de lancer &quot;%1&quot; : %2</translation>
-    </message>
-    <message>
-        <source>&quot;%1&quot; timed out after %2ms.</source>
-        <translation type="obsolete">&quot;%1&quot; arrivé à échéance après %2ms.</translation>
-    </message>
-    <message>
-        <source>&quot;%1&quot; crashed.</source>
-        <translation type="obsolete">&quot;%1&quot; a crashé.</translation>
-    </message>
-    <message>
-        <source>&quot;%1&quot; terminated with exit code %2: %3</source>
-        <translation type="obsolete">&quot;%1&quot; terminé avec le code %2 : %3</translation>
-    </message>
-    <message>
-        <source>The client does not seem to contain any mapped files.</source>
-        <translation type="obsolete">Le client ne semble contenir aucun fichier correspondant.</translation>
-    </message>
-</context>
-<context>
-    <name>Perforce::Internal::ChangeNumberDialog</name>
     <message>
         <source>Change Number</source>
         <translatorcomment>?</translatorcomment>
@@ -9375,9 +9348,6 @@ dans votre fichier .pro.</translation>
         <translatorcomment>?</translatorcomment>
         <translation>Numéro du changement :</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PendingChangesDialog</name>
     <message>
         <source>P4 Pending Changes</source>
         <translation>Modifications pour P4 en attente</translation>
@@ -9394,9 +9364,6 @@ dans votre fichier .pro.</translation>
         <source>Change %1: %2</source>
         <translation>Modification %1 : %2</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforcePlugin</name>
     <message>
         <source>&amp;Perforce</source>
         <translation>&amp;Perforce</translation>
@@ -9621,10 +9588,6 @@ dans votre fichier .pro.</translation>
         <source>Repository Log</source>
         <translation>Log du dépôt</translation>
     </message>
-    <message>
-        <source>Submit</source>
-        <translation>Envoyer</translation>
-    </message>
     <message>
         <source>Diff Selected Files</source>
         <translation type="obsolete">Faire un diff sur tous les fichiers sélectionnés</translation>
@@ -9792,16 +9755,10 @@ francis : voila une nouvelle suggestion :)</translatorcomment>
         <source>Error running &quot;where&quot; on %1: The file is not mapped</source>
         <translation type="obsolete">Erreur d&apos;exécution de &quot;where&quot; sur %1 : le fichier n&apos;est pas mappé</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceSubmitEditor</name>
     <message>
         <source>Perforce Submit</source>
         <translation>Perforce Submit</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PromptDialog</name>
     <message>
         <source>Perforce Prompt</source>
         <translation>Prompt Perforce</translation>
@@ -9810,9 +9767,6 @@ francis : voila une nouvelle suggestion :)</translatorcomment>
         <source>OK</source>
         <translation>OK</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPage</name>
     <message>
         <source>Prompt to submit</source>
         <translation type="obsolete">Invite lors du submit</translation>
@@ -9897,9 +9851,6 @@ francis : voila une nouvelle suggestion :)</translatorcomment>
         <source>Automatically open files when editing</source>
         <translation>Ouvrir automatiquement les fichiers lors de l&apos;édition</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPageWidget</name>
     <message>
         <source>Perforce Command</source>
         <translation>Commande Perforce</translation>
@@ -9916,13 +9867,6 @@ francis : voila une nouvelle suggestion :)</translatorcomment>
         <source>Test succeeded.</source>
         <translation type="obsolete">Test réussi.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SubmitPanel</name>
-    <message>
-        <source>Submit</source>
-        <translation>Envoyer</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation>Modification :</translation>
@@ -22963,7 +22907,7 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus.</translation>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceChecker</name>
+    <name>::Perforce</name>
     <message>
         <source>No executable specified</source>
         <translation>Aucun exécutable spécifié</translation>
@@ -22997,9 +22941,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus.</translation>
         <source>The repository &quot;%1&quot; does not exist.</source>
         <translation>Le dépôt &quot;%1&quot; n&apos;existe pas.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceEditor</name>
     <message>
         <source>Annotate change list &quot;%1&quot;</source>
         <translation>Annoter la liste des changements &quot;%1&quot;</translation>
@@ -35774,7 +35715,7 @@ These files are preserved.</source>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceDiffParameterWidget</name>
+    <name>::Perforce</name>
     <message>
         <source>Ignore whitespace</source>
         <translation>Ignorer l&apos;espace blanc</translation>
@@ -46198,7 +46139,7 @@ were not verified among remotes in %3. Select different folder?</source>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceVersionControl</name>
+    <name>::Perforce</name>
     <message>
         <source>&amp;Edit (%1)</source>
         <translation type="obsolete">&amp;Éditer (%1)</translation>

share/qtcreator/translations/qtcreator_hr.ts

@@ -4980,7 +4980,7 @@ Greška: %5</translation>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::ChangeNumberDialog</name>
+    <name>::Perforce</name>
     <message>
         <source>Change Number</source>
         <translation>Promijeni broj</translation>
@@ -4989,9 +4989,6 @@ Greška: %5</translation>
         <source>Change Number:</source>
         <translation>Promijeni broj:</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PendingChangesDialog</name>
     <message>
         <source>P4 Pending Changes</source>
         <translation>P4 neobavljene promjene</translation>
@@ -5008,9 +5005,6 @@ Greška: %5</translation>
         <source>Change %1: %2</source>
         <translation>Promijeni %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PromptDialog</name>
     <message>
         <source>Perforce Prompt</source>
         <translation>Perforce prompt</translation>
@@ -5019,9 +5013,6 @@ Greška: %5</translation>
         <source>OK</source>
         <translation>U redu</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPage</name>
     <message>
         <source>Configuration</source>
         <translation>Konfiguracija</translation>
@@ -5078,13 +5069,6 @@ Greška: %5</translation>
         <source>Perforce</source>
         <translation>Perforce</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SubmitPanel</name>
-    <message>
-        <source>Submit</source>
-        <translation>Pošalji</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation>Promijeni:</translation>
@@ -26193,7 +26177,7 @@ Rok upotrebe: %3</translation>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceChecker</name>
+    <name>::Perforce</name>
     <message>
         <source>No executable specified</source>
         <translation>Izvršna datoteka nije specificirana</translation>
@@ -26227,16 +26211,10 @@ Rok upotrebe: %3</translation>
         <source>The repository &quot;%1&quot; does not exist.</source>
         <translation>Spremište &quot;%1&quot; ne postoji.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceEditorWidget</name>
     <message>
         <source>Annotate change list &quot;%1&quot;</source>
         <translation>Pribilježi popis promjena &quot;%1&quot;</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforcePlugin</name>
     <message>
         <source>&amp;Perforce</source>
         <translation>&amp;Perforce</translation>
@@ -26521,10 +26499,6 @@ Rok upotrebe: %3</translation>
             <numerusform></numerusform>
         </translation>
     </message>
-    <message>
-        <source>Submit</source>
-        <translation>Pošalji</translation>
-    </message>
     <message>
         <source>p4 diff %1</source>
         <translation type="unfinished"></translation>
@@ -26563,23 +26537,14 @@ Rok upotrebe: %3</translation>
         <source>Perforce: Unable to determine the repository: %1</source>
         <translation>Perforce: Nije moguće odrediti spremište: %1</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceDiffConfig</name>
     <message>
         <source>Ignore Whitespace</source>
         <translation>Zanemari bjeline</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceSubmitEditor</name>
     <message>
         <source>Perforce Submit</source>
         <translation>Perforce slanje</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceVersionControl</name>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Uredi</translation>
@@ -26588,9 +26553,6 @@ Rok upotrebe: %3</translation>
         <source>&amp;Hijack</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPageWidget</name>
     <message>
         <source>Perforce Command</source>
         <translation>Perforce naredba</translation>

share/qtcreator/translations/qtcreator_hu.ts

@@ -9243,7 +9243,7 @@ p, li { white-space: pre-wrap; }
     </message>
 </context>
 <context>
-    <name>Perforce::0</name>
+    <name>::Perforce</name>
     <message>
         <source>No executable specified</source>
         <translation type="obsolete">Nincs futtatható meghatározva</translation>
@@ -9268,9 +9268,6 @@ p, li { white-space: pre-wrap; }
         <source>The client does not seem to contain any mapped files.</source>
         <translation type="obsolete">Nem tűnik úgy, hogy a Perforce kliens tartalmazna leképezett fájlokat.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal</name>
     <message>
         <source>No executable specified</source>
         <translation>Nincs futtatható meghatározva</translation>
@@ -9295,9 +9292,6 @@ p, li { white-space: pre-wrap; }
         <source>The client does not seem to contain any mapped files.</source>
         <translation>Nem tűnik úgy, hogy a Perforce kliens tartalmazna leképezett fájlokat.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::0</name>
     <message>
         <source>Change Number</source>
         <translation type="obsolete">Változtatási szám</translation>
@@ -9672,9 +9666,6 @@ p, li { white-space: pre-wrap; }
         <source>User:</source>
         <translation type="obsolete">Felhasználó:</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::ChangeNumberDialog</name>
     <message>
         <source>Change Number</source>
         <translation>Változtatási szám</translation>
@@ -9683,9 +9674,6 @@ p, li { white-space: pre-wrap; }
         <source>Change Number:</source>
         <translation>Változtatási szám:</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PendingChangesDialog</name>
     <message>
         <source>P4 Pending Changes</source>
         <translation>Függőben levő P4 változtatások</translation>
@@ -9702,9 +9690,6 @@ p, li { white-space: pre-wrap; }
         <source>Change %1: %2</source>
         <translation>%1 változtatása: %2</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforcePlugin</name>
     <message>
         <source>&amp;Perforce</source>
         <translation>&amp;Perforce</translation>
@@ -9857,10 +9842,6 @@ p, li { white-space: pre-wrap; }
         <source>Update All</source>
         <translation>Az összes frissítése</translation>
     </message>
-    <message>
-        <source>Submit</source>
-        <translation>Feltöltés</translation>
-    </message>
     <message>
         <source>Diff Selected Files</source>
         <translation>Különbség a kiválasztott fájlokban</translation>
@@ -9982,16 +9963,10 @@ p, li { white-space: pre-wrap; }
         <source>Error running &quot;where&quot; on %1: The file is not mapped</source>
         <translation>Hiba történt a(z) %1 futtatása közben: a fájl nincsen leképezve</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceSubmitEditor</name>
     <message>
         <source>Perforce Submit</source>
         <translation>Perforce feltöltés</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PromptDialog</name>
     <message>
         <source>Perforce Prompt</source>
         <translation>Perforce prompt</translation>
@@ -10000,9 +9975,6 @@ p, li { white-space: pre-wrap; }
         <source>OK</source>
         <translation>OK</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPage</name>
     <message>
         <source>Prompt to submit</source>
         <translation>Feltöltési prompt</translation>
@@ -10039,9 +10011,6 @@ p, li { white-space: pre-wrap; }
         <source>Perforce</source>
         <translation>Perforce</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPageWidget</name>
     <message>
         <source>Perforce Command</source>
         <translation>Perforce parancs</translation>
@@ -10054,13 +10023,6 @@ p, li { white-space: pre-wrap; }
         <source>Test succeeded.</source>
         <translation>Sikeres teszt.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SubmitPanel</name>
-    <message>
-        <source>Submit</source>
-        <translation>Feltöltés</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation>Változás:</translation>

share/qtcreator/translations/qtcreator_it.ts

@@ -6015,7 +6015,7 @@ nel tuo file .pro.</translation>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal</name>
+    <name>::Perforce</name>
     <message>
         <source>No executable specified</source>
         <translation>Non è stato impostato alcun eseguibile</translation>
@@ -6040,9 +6040,6 @@ nel tuo file .pro.</translation>
         <source>The client does not seem to contain any mapped files.</source>
         <translation>Il client non sembra contenere alcun file mappato.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::ChangeNumberDialog</name>
     <message>
         <source>Change Number</source>
         <translation>Numero della Modifica</translation>
@@ -6052,9 +6049,6 @@ nel tuo file .pro.</translation>
         <source>Change Number:</source>
         <translation>Numero della Modifica:</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PendingChangesDialog</name>
     <message>
         <source>P4 Pending Changes</source>
         <translation>P4 Modifiche in Sospeso</translation>
@@ -6073,9 +6067,6 @@ nel tuo file .pro.</translation>
         <source>Change %1: %2</source>
         <translation>Modifica %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceOutputWindow</name>
     <message>
         <source>Perforce Output</source>
         <translation type="obsolete">Output di Perforce</translation>
@@ -6088,9 +6079,6 @@ nel tuo file .pro.</translation>
         <source>Perforce</source>
         <translation type="obsolete">Perforce</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforcePlugin</name>
     <message>
         <source>&amp;Perforce</source>
         <translation>&amp;Perforce</translation>
@@ -6374,16 +6362,10 @@ nel tuo file .pro.</translation>
         <source>Error running &quot;where&quot; on %1: The file is not mapped</source>
         <translation>Errore in esecuzione di &quot;where&quot; su %1. Il file non è mappato</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceSubmitEditor</name>
     <message>
         <source>Perforce Submit</source>
         <translation>Invio Perforce</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PromptDialog</name>
     <message>
         <source>Perforce Prompt</source>
         <translation>Richiesta Perforce</translation>
@@ -6393,9 +6375,6 @@ nel tuo file .pro.</translation>
         <source>OK</source>
         <translation>OK</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPage</name>
     <message>
         <source>P4 Command:</source>
         <translation>Comando P4:</translation>
@@ -6438,9 +6417,6 @@ nel tuo file .pro.</translation>
         <source>Prompt to submit</source>
         <translation type="unfinished">Prompt del submit</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPageWidget</name>
     <message>
         <source>Testing...</source>
         <translation>Test...</translation>
@@ -6453,13 +6429,6 @@ nel tuo file .pro.</translation>
         <source>Perforce Command</source>
         <translation>Comando Perforce</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SubmitPanel</name>
-    <message>
-        <source>Submit</source>
-        <translation>Invio</translation>
-    </message>
     <message>
         <location/>
         <source>Change:</source>

share/qtcreator/translations/qtcreator_ja.ts

@@ -3898,7 +3898,7 @@ Add, modify, and remove document filters, which determine the documentation set
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::ChangeNumberDialog</name>
+    <name>::Perforce</name>
     <message>
         <source>Change Number</source>
         <translation>リビジョン番号</translation>
@@ -3907,9 +3907,6 @@ Add, modify, and remove document filters, which determine the documentation set
         <source>Change Number:</source>
         <translation>リビジョン番号:</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PendingChangesDialog</name>
     <message>
         <source>P4 Pending Changes</source>
         <translation>P4 保留中の変更点</translation>
@@ -3926,9 +3923,6 @@ Add, modify, and remove document filters, which determine the documentation set
         <source>Change %1: %2</source>
         <translation>変更 %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PromptDialog</name>
     <message>
         <source>Perforce Prompt</source>
         <translation>Perforce プロンプト</translation>
@@ -3937,9 +3931,6 @@ Add, modify, and remove document filters, which determine the documentation set
         <source>OK</source>
         <translation>OK</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPage</name>
     <message>
         <source>Configuration</source>
         <translation>設定</translation>
@@ -3996,10 +3987,6 @@ Add, modify, and remove document filters, which determine the documentation set
         <source>Perforce Command</source>
         <translation>Perforce コマンド</translation>
     </message>
-    <message>
-        <source>Testing...</source>
-        <translation>自動テスト...</translation>
-    </message>
     <message>
         <source>Test succeeded (%1).</source>
         <translation>テストが成功しました (%1)。</translation>
@@ -4008,13 +3995,6 @@ Add, modify, and remove document filters, which determine the documentation set
         <source>Perforce</source>
         <translation>Perforce</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SubmitPanel</name>
-    <message>
-        <source>Submit</source>
-        <translation>サブミット</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation>リビジョン:</translation>
@@ -21953,7 +21933,7 @@ instead of its installation directory when run outside git bash.</source>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceChecker</name>
+    <name>::Perforce</name>
     <message>
         <source>No executable specified</source>
         <translation>実行ファイルが指定されていません</translation>
@@ -21987,9 +21967,6 @@ instead of its installation directory when run outside git bash.</source>
         <source>The repository &quot;%1&quot; does not exist.</source>
         <translation>リポジトリ &quot;%1&quot; は存在しません。</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforcePlugin</name>
     <message>
         <source>&amp;Perforce</source>
         <translation>&amp;Perforce</translation>
@@ -22210,10 +22187,6 @@ instead of its installation directory when run outside git bash.</source>
         <source>&amp;Hijack</source>
         <translation>ハイジャック(&amp;H)</translation>
     </message>
-    <message>
-        <source>Submit</source>
-        <translation>サブミット</translation>
-    </message>
     <message>
         <source>Diff &amp;Selected Files</source>
         <translation>選択済みファイルの差分表示(&amp;S)</translation>
@@ -22346,46 +22319,18 @@ instead of its installation directory when run outside git bash.</source>
         <source>Perforce: Unable to determine the repository: %1</source>
         <translation>Perforce がリポジトリを特定できません: %1</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceDiffParameterWidget</name>
     <message>
         <source>Ignore Whitespace</source>
         <translation>空白を無視</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceSubmitEditor</name>
     <message>
         <source>Perforce Submit</source>
         <translation>Perforce コミット</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceVersionControl</name>
-    <message>
-        <source>&amp;Edit</source>
-        <translation>編集(&amp;E)</translation>
-    </message>
-    <message>
-        <source>&amp;Hijack</source>
-        <translation>ハイジャック(&amp;H)</translation>
-    </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPageWidget</name>
-    <message>
-        <source>Perforce Command</source>
-        <translation>Perforce コマンド</translation>
-    </message>
     <message>
         <source>Testing...</source>
         <translation>テスト中...</translation>
     </message>
-    <message>
-        <source>Test succeeded (%1).</source>
-        <translation>テストが成功しました (%1)。</translation>
-    </message>
 </context>
 <context>
     <name>::ProjectExplorer</name>
@@ -40254,7 +40199,7 @@ Would you like to overwrite it?</source>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceEditorWidget</name>
+    <name>::Perforce</name>
     <message>
         <source>Annotate change list &quot;%1&quot;</source>
         <translation>チェンジリスト &quot;%1&quot; のアノテーション</translation>
@@ -47000,11 +46945,7 @@ Stepping into the module or setting breakpoints by file and line is expected to
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceDiffConfig</name>
+    <name>::Perforce</name>
-    <message>
-        <source>Ignore Whitespace</source>
-        <translation>空白を無視</translation>
-    </message>
 </context>
 <context>
     <name>::PerfProfiler</name>

share/qtcreator/translations/qtcreator_pl.ts

@@ -630,7 +630,7 @@
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::ChangeNumberDialog</name>
+    <name>::Perforce</name>
     <message>
         <source>Change Number</source>
         <translation>Numer zmiany</translation>
@@ -639,9 +639,6 @@
         <source>Change Number:</source>
         <translation>Numer zmiany:</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PendingChangesDialog</name>
     <message>
         <source>P4 Pending Changes</source>
         <translation>Oczekujące zmiany P4</translation>
@@ -658,9 +655,6 @@
         <source>Change %1: %2</source>
         <translation>Zmiana %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PromptDialog</name>
     <message>
         <source>Perforce Prompt</source>
         <translation>Pytanie Perforce&apos;a</translation>
@@ -669,9 +663,6 @@
         <source>OK</source>
         <translation>OK</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPage</name>
     <message>
         <source>Test</source>
         <translation>Przetestuj</translation>
@@ -728,13 +719,6 @@
         <source>Automatically open files when editing</source>
         <translation>Automatycznie otwieraj pliki, jeśli zostały zmodyfikowane</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SubmitPanel</name>
-    <message>
-        <source>Submit</source>
-        <translation>Utwórz poprawkę</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation>Zmiana:</translation>
@@ -6643,7 +6627,7 @@ Dodaj, zmodyfikuj lub usuń filtry dokumentów, które determinują zestaw dokum
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforcePlugin</name>
+    <name>::Perforce</name>
     <message>
         <source>&amp;Perforce</source>
         <translation>&amp;Perforce</translation>
@@ -6856,10 +6840,6 @@ Dodaj, zmodyfikuj lub usuń filtry dokumentów, które determinują zestaw dokum
         <source>Repository Log</source>
         <translation>Log repozytorium</translation>
     </message>
-    <message>
-        <source>Submit</source>
-        <translation>Utwórz poprawkę</translation>
-    </message>
     <message>
         <source>&amp;Undo</source>
         <translation>&amp;Cofnij</translation>
@@ -6995,16 +6975,10 @@ Dodaj, zmodyfikuj lub usuń filtry dokumentów, które determinują zestaw dokum
         <source>Could not submit the change, because your workspace was out of date. Created a pending submit instead.</source>
         <translation>Nie można utworzyć poprawki, ponieważ drzewo robocze nie jest aktualne. Zamiast tego utworzono poprawkę oczekującą na wysłanie.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceSubmitEditor</name>
     <message>
         <source>Perforce Submit</source>
         <translation>Utwórz poprawkę w Perforce</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPageWidget</name>
     <message>
         <source>Perforce Command</source>
         <translation>Komenda Perforce</translation>
@@ -11069,7 +11043,7 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceChecker</name>
+    <name>::Perforce</name>
     <message>
         <source>No executable specified</source>
         <translation>Nie podano programu do uruchomienia</translation>
@@ -22623,7 +22597,7 @@ You can choose another communication channel here, such as a serial line or cust
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceVersionControl</name>
+    <name>::Perforce</name>
     <message>
         <source>&amp;Edit</source>
         <translation>&amp;Edycja</translation>
@@ -31152,7 +31126,7 @@ Use this only if you are prototyping. You cannot create a full application with
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceEditorWidget</name>
+    <name>::Perforce</name>
     <message>
         <source>Annotate change list &quot;%1&quot;</source>
         <translation>Dołącz adnotację do listy zmian &quot;%1&quot;</translation>
@@ -40043,7 +40017,7 @@ Termin wygaśnięcia: %3</translation>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceDiffConfig</name>
+    <name>::Perforce</name>
     <message>
         <source>Ignore Whitespace</source>
         <translation>Ignoruj białe znaki</translation>

share/qtcreator/translations/qtcreator_ru.ts

@@ -27162,7 +27162,7 @@ You might find further explanations in the Application Output view.</source>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::ChangeNumberDialog</name>
+    <name>::Perforce</name>
     <message>
         <source>Change Number</source>
         <translation>Номер правки</translation>
@@ -27171,9 +27171,6 @@ You might find further explanations in the Application Output view.</source>
         <source>Change Number:</source>
         <translation>Номер правки:</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PendingChangesDialog</name>
     <message>
         <source>P4 Pending Changes</source>
         <translation>Perforce: Рассмотрение изменений</translation>
@@ -27190,9 +27187,6 @@ You might find further explanations in the Application Output view.</source>
         <source>Change %1: %2</source>
         <translation>Изменение %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceChecker</name>
     <message>
         <source>No executable specified</source>
         <translation>Программа не указана</translation>
@@ -27226,23 +27220,14 @@ You might find further explanations in the Application Output view.</source>
         <source>The repository &quot;%1&quot; does not exist.</source>
         <translation>Хранилище «%1» отсутствует.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceDiffConfig</name>
     <message>
         <source>Ignore Whitespace</source>
         <translation>Игнорировать пробелы</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceEditorWidget</name>
     <message>
         <source>Annotate change list &quot;%1&quot;</source>
         <translation>Аннотация списка изменений «%1»</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforcePlugin</name>
     <message>
         <source>&amp;Perforce</source>
         <translation>&amp;Perforce</translation>
@@ -27463,10 +27448,6 @@ You might find further explanations in the Application Output view.</source>
         <source>&amp;Hijack</source>
         <translation>&amp;Исправить</translation>
     </message>
-    <message>
-        <source>Submit</source>
-        <translation>Фиксировать</translation>
-    </message>
     <message>
         <source>p4 revert</source>
         <translation>p4 revert</translation>
@@ -27577,16 +27558,10 @@ You might find further explanations in the Application Output view.</source>
         <source>Could not submit the change, because your workspace was out of date. Created a pending submit instead.</source>
         <translation>Не удалось зафиксировать изменения, так как рабочая копия устарела. Создана фиксация для рассмотрения.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceSubmitEditor</name>
     <message>
         <source>Perforce Submit</source>
         <translation>Фиксация Perforce</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PromptDialog</name>
     <message>
         <source>Perforce Prompt</source>
         <translation>Perforce: приглашение</translation>
@@ -27595,9 +27570,6 @@ You might find further explanations in the Application Output view.</source>
         <source>OK</source>
         <translation>Закрыть</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPage</name>
     <message>
         <source>Test</source>
         <translation>Проверить</translation>
@@ -27666,13 +27638,6 @@ You might find further explanations in the Application Output view.</source>
         <source>Automatically open files when editing</source>
         <translation>Автоматически открывать файлы при изменении</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SubmitPanel</name>
-    <message>
-        <source>Submit</source>
-        <translation>Фиксировать</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation>Правка:</translation>

share/qtcreator/translations/qtcreator_sl.ts

@@ -6337,7 +6337,7 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::ChangeNumberDialog</name>
+    <name>::Perforce</name>
     <message>
         <source>Change Number</source>
         <translation>Številka spremembe</translation>
@@ -6347,18 +6347,10 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr
         <source>Change Number:</source>
         <translation>Številka spremembe:</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PendingChangesDialog</name>
     <message>
         <source>P4 Pending Changes</source>
         <translation>Čakajoče spremembe P4</translation>
     </message>
-    <message>
-        <location/>
-        <source>Submit</source>
-        <translation>Pošlji</translation>
-    </message>
     <message>
         <location/>
         <source>Cancel</source>
@@ -6368,9 +6360,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr
         <source>Change %1: %2</source>
         <translation>Sprememba %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforcePlugin</name>
     <message>
         <source>&amp;Perforce</source>
         <translation>&amp;Perforce</translation>
@@ -6511,10 +6500,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr
         <source>Update All</source>
         <translation>Posodobi vse</translation>
     </message>
-    <message>
-        <source>Submit</source>
-        <translation>Pošlji</translation>
-    </message>
     <message>
         <source>&amp;Undo</source>
         <translation>&amp;Razveljavi</translation>
@@ -6705,16 +6690,10 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr
         <source>Cannot open temporary file.</source>
         <translation type="obsolete">Ni moč odpreti začasne datoteke.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceSubmitEditor</name>
     <message>
         <source>Perforce Submit</source>
         <translation>Pošiljanje Perforce</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PromptDialog</name>
     <message>
         <source>Perforce Prompt</source>
         <translation>Poziv Perforce</translation>
@@ -6724,9 +6703,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr
         <source>OK</source>
         <translation>V redu</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPage</name>
     <message>
         <source>Perforce</source>
         <translation>Perforce</translation>
@@ -6795,9 +6771,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr
         <source>Automatically open files when editing</source>
         <translation>Med urejanjem samodejno odpiraj datoteke</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPageWidget</name>
     <message>
         <source>Testing...</source>
         <translation>Preizkušanje …</translation>
@@ -6810,9 +6783,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr
         <source>Perforce Command</source>
         <translation>Ukaz Perforce</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SubmitPanel</name>
     <message>
         <source>Submit</source>
         <translation>Pošiljanje</translation>
@@ -15756,7 +15726,7 @@ Desetiška predznačena vrednost (najprej veliki konec): %4</translation>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceChecker</name>
+    <name>::Perforce</name>
     <message>
         <source>No executable specified</source>
         <translation>Določen ni noben program.</translation>
@@ -15791,9 +15761,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4</translation>
         <source>The repository &quot;%1&quot; does not exist.</source>
         <translation>Skladišče »%1« ne obstaja.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceEditor</name>
     <message>
         <source>Annotate change list &quot;%1&quot;</source>
         <translation>Dodaj opombo za seznam sprememb »%1«</translation>
@@ -23866,7 +23833,7 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen.</translation>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceDiffParameterWidget</name>
+    <name>::Perforce</name>
     <message>
         <source>Ignore whitespace</source>
         <translation>Prezri presledke</translation>

share/qtcreator/translations/qtcreator_uk.ts

@@ -11916,7 +11916,7 @@ Ids must begin with a lowercase letter.</source>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::ChangeNumberDialog</name>
+    <name>::Perforce</name>
     <message>
         <source>Change Number</source>
         <translation type="unfinished"></translation>
@@ -11925,9 +11925,6 @@ Ids must begin with a lowercase letter.</source>
         <source>Change Number:</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PendingChangesDialog</name>
     <message>
         <source>P4 Pending Changes</source>
         <translation type="unfinished"></translation>
@@ -11944,9 +11941,6 @@ Ids must begin with a lowercase letter.</source>
         <source>Change %1: %2</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceChecker</name>
     <message>
         <source>No executable specified</source>
         <translation>Виконуваний модуль не вказано</translation>
@@ -11984,9 +11978,6 @@ Ids must begin with a lowercase letter.</source>
         <source>The repository &quot;%1&quot; does not exist.</source>
         <translation>Сховище &quot;%1&quot; не існує.</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceDiffParameterWidget</name>
     <message>
         <source>Ignore whitespace</source>
         <translation type="vanished">Ігнорувати пропуски</translation>
@@ -11995,9 +11986,6 @@ Ids must begin with a lowercase letter.</source>
         <source>Ignore Whitespace</source>
         <translation>Ігнорувати пропуски</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforcePlugin</name>
     <message>
         <source>&amp;Perforce</source>
         <translation type="unfinished"></translation>
@@ -12210,10 +12198,6 @@ Ids must begin with a lowercase letter.</source>
         <source>Filelog...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Submit</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Diff &amp;Selected Files</source>
         <translation>&amp;Зміни у вибраних файлах</translation>
@@ -12356,16 +12340,10 @@ Ids must begin with a lowercase letter.</source>
         <source>Perforce: Unable to determine the repository: %1</source>
         <translation>Perforce: Неможливо визначити сховище: %1</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceSubmitEditor</name>
     <message>
         <source>Perforce Submit</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PromptDialog</name>
     <message>
         <source>Perforce Prompt</source>
         <translation type="unfinished"></translation>
@@ -12374,9 +12352,6 @@ Ids must begin with a lowercase letter.</source>
         <source>OK</source>
         <translation>OK</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPage</name>
     <message>
         <source>Configuration</source>
         <translation>Конфігурація</translation>
@@ -12433,9 +12408,6 @@ Ids must begin with a lowercase letter.</source>
         <source>Automatically open files when editing</source>
         <translation>Автоматично відкривати файли під час редагування</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPageWidget</name>
     <message>
         <source>Perforce Command</source>
         <translation>Команда Perforce</translation>
@@ -12448,13 +12420,6 @@ Ids must begin with a lowercase letter.</source>
         <source>Test succeeded (%1).</source>
         <translation>Перевірка успішна (%1).</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SubmitPanel</name>
-    <message>
-        <source>Submit</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation>Зміна:</translation>
@@ -28891,7 +28856,7 @@ Do you want to add them to the project?&lt;/html&gt;</source>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceVersionControl</name>
+    <name>::Perforce</name>
     <message>
         <source>&amp;Edit</source>
         <translation type="unfinished"></translation>
@@ -41456,7 +41421,7 @@ Preselects a desktop Qt for building the application if available.</source>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceEditorWidget</name>
+    <name>::Perforce</name>
     <message>
         <source>Annotate change list &quot;%1&quot;</source>
         <translation type="unfinished"></translation>

share/qtcreator/translations/qtcreator_zh_CN.ts

@@ -26543,7 +26543,7 @@ You might find further explanations in the Application Output view.</source>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::ChangeNumberDialog</name>
+    <name>::Perforce</name>
     <message>
         <source>Change Number</source>
         <translation>Change编号</translation>
@@ -26552,9 +26552,6 @@ You might find further explanations in the Application Output view.</source>
         <source>Change Number:</source>
         <translation>Change编号:</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PendingChangesDialog</name>
     <message>
         <source>P4 Pending Changes</source>
         <translation>P4未完成的Change</translation>
@@ -26571,9 +26568,6 @@ You might find further explanations in the Application Output view.</source>
         <source>Change %1: %2</source>
         <translation>Change %1: %2</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceChecker</name>
     <message>
         <source>No executable specified</source>
         <translation>未指定执行档</translation>
@@ -26607,23 +26601,14 @@ You might find further explanations in the Application Output view.</source>
         <source>&quot;%1&quot; timed out after %2 ms.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceDiffConfig</name>
     <message>
         <source>Ignore Whitespace</source>
         <translation type="unfinished">忽略空白</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceEditorWidget</name>
     <message>
         <source>Annotate change list &quot;%1&quot;</source>
         <translation type="unfinished">注释变更列表 &quot;%1&quot;</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforcePlugin</name>
     <message>
         <source>&amp;Perforce</source>
         <translation>&amp;Perforce</translation>
@@ -26804,10 +26789,6 @@ You might find further explanations in the Application Output view.</source>
         <source>Repository Log</source>
         <translation>仓库日志</translation>
     </message>
-    <message>
-        <source>Submit</source>
-        <translation>提交</translation>
-    </message>
     <message>
         <source>p4 revert</source>
         <translation>p4 还原(revert)</translation>
@@ -26956,16 +26937,10 @@ You might find further explanations in the Application Output view.</source>
             <numerusform></numerusform>
         </translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceSubmitEditor</name>
     <message>
         <source>Perforce Submit</source>
         <translation>Perforce提交</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPage</name>
     <message>
         <source>Perforce</source>
         <translation>Perforce</translation>
@@ -27034,13 +27009,6 @@ You might find further explanations in the Application Output view.</source>
         <source>Testing...</source>
         <translation type="unfinished">测试中...</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SubmitPanel</name>
-    <message>
-        <source>Submit</source>
-        <translation>提交</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation>更改:</translation>

share/qtcreator/translations/qtcreator_zh_TW.ts

@@ -5874,7 +5874,7 @@ Add, modify, and remove document filters, which determine the documentation set
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::ChangeNumberDialog</name>
+    <name>::Perforce</name>
     <message>
         <source>Change Number</source>
         <translation>變更數值</translation>
@@ -5883,9 +5883,6 @@ Add, modify, and remove document filters, which determine the documentation set
         <source>Change Number:</source>
         <translation>變更數值：</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PendingChangesDialog</name>
     <message>
         <source>P4 Pending Changes</source>
         <translation>P4 未完成的變更</translation>
@@ -5902,9 +5899,6 @@ Add, modify, and remove document filters, which determine the documentation set
         <source>Change %1: %2</source>
         <translation>變更 %1：%2</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforcePlugin</name>
     <message>
         <source>&amp;Perforce</source>
         <translation>Perforce(&amp;P)</translation>
@@ -6113,10 +6107,6 @@ Add, modify, and remove document filters, which determine the documentation set
         <source>Repository Log</source>
         <translation>主目錄紀錄</translation>
     </message>
-    <message>
-        <source>Submit</source>
-        <translation>提交</translation>
-    </message>
     <message>
         <source>&amp;Undo</source>
         <translation>復原(&amp;U)</translation>
@@ -6245,16 +6235,10 @@ Add, modify, and remove document filters, which determine the documentation set
         <source>Could not submit the change, because your workspace was out of date. Created a pending submit instead.</source>
         <translation>無法提交變更，因為您的工作空間已經過時。已幫您建立了一個「未完成的提交」。</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PerforceSubmitEditor</name>
     <message>
         <source>Perforce Submit</source>
         <translation>Perforce 提交</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::PromptDialog</name>
     <message>
         <source>Perforce Prompt</source>
         <translation>Perforce 提示</translation>
@@ -6263,9 +6247,6 @@ Add, modify, and remove document filters, which determine the documentation set
         <source>OK</source>
         <translation>確定</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPage</name>
     <message>
         <source>Perforce</source>
         <translation>Perforce</translation>
@@ -6322,9 +6303,6 @@ Add, modify, and remove document filters, which determine the documentation set
         <source>Automatically open files when editing</source>
         <translation>編輯時自動開啟檔案</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SettingsPageWidget</name>
     <message>
         <source>Testing...</source>
         <translation>測試中...</translation>
@@ -6337,13 +6315,6 @@ Add, modify, and remove document filters, which determine the documentation set
         <source>Perforce Command</source>
         <translation>Perforce 指令</translation>
     </message>
-</context>
-<context>
-    <name>Perforce::Internal::SubmitPanel</name>
-    <message>
-        <source>Submit</source>
-        <translation>提交</translation>
-    </message>
     <message>
         <source>Change:</source>
         <translation>變更：</translation>
@@ -11898,7 +11869,7 @@ Reason: %2</source>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceChecker</name>
+    <name>::Perforce</name>
     <message>
         <source>No executable specified</source>
         <translation>未指定執行檔</translation>
@@ -12799,7 +12770,7 @@ For qmlproject projects, use the importPaths property to add import paths.</sour
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceEditor</name>
+    <name>::Perforce</name>
     <message>
         <source>Annotate change list &quot;%1&quot;</source>
         <translation>註記變更列表 &quot;%1&quot;</translation>
@@ -21610,7 +21581,7 @@ These files are preserved.</source>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceDiffParameterWidget</name>
+    <name>::Perforce</name>
     <message>
         <source>Ignore whitespace</source>
         <translation>忽略空白</translation>
@@ -30999,7 +30970,7 @@ Do you want to add them to the project?&lt;/html&gt;</source>
     </message>
 </context>
 <context>
-    <name>Perforce::Internal::PerforceVersionControl</name>
+    <name>::Perforce</name>
     <message>
         <source>&amp;Edit (%1)</source>
         <translation type="unfinished"></translation>

src/plugins/perforce/annotationhighlighter.cpp

@@ -3,8 +3,7 @@
 
 #include "annotationhighlighter.h"
 
-namespace Perforce {
+namespace Perforce::Internal {
-namespace Internal {
 
 PerforceAnnotationHighlighter::PerforceAnnotationHighlighter(const ChangeNumbers &changeNumbers,
                                                              QTextDocument *document) :
@@ -17,5 +16,4 @@ QString PerforceAnnotationHighlighter::changeNumber(const QString &block) const
     return pos > 1 ? block.left(pos) : QString();
 }
 
-} // Internal
+} // Perforce::Internal
-} // Perforce

src/plugins/perforce/annotationhighlighter.h

@@ -5,8 +5,7 @@
 
 #include <vcsbase/baseannotationhighlighter.h>
 
-namespace Perforce {
+namespace Perforce::Internal {
-namespace Internal {
 
 // Annotation highlighter for p4 triggering on 'changenumber:'
 class PerforceAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
@@ -20,5 +19,4 @@ private:
     QString changeNumber(const QString &block) const override;
 };
 
-} // namespace Perforce
+} // Perforce::Internal
-} // namespace Internal

src/plugins/perforce/changenumberdialog.cpp

@@ -3,19 +3,21 @@
 
 #include "changenumberdialog.h"
 
+#include "perforcetr.h"
+
 #include <utils/layoutbuilder.h>
 
 #include <QDialogButtonBox>
 #include <QIntValidator>
 #include <QLineEdit>
 
-using namespace Perforce::Internal;
+namespace Perforce::Internal {
 
 ChangeNumberDialog::ChangeNumberDialog(QWidget *parent)
     : QDialog(parent)
     , m_lineEdit(new QLineEdit(this))
 {
-    setWindowTitle(tr("Change Number"));
+    setWindowTitle(Tr::tr("Change Number"));
 
     m_lineEdit->setValidator(new QIntValidator(0, 1000000, this));
 
@@ -28,7 +30,7 @@ ChangeNumberDialog::ChangeNumberDialog(QWidget *parent)
     using namespace Utils::Layouting;
 
     Column {
-        Row { tr("Change number:"), m_lineEdit },
+        Row { Tr::tr("Change number:"), m_lineEdit },
         buttonBox
     }.attachTo(this);
 
@@ -41,3 +43,5 @@ int ChangeNumberDialog::number() const
     const int number = m_lineEdit->text().toInt(&ok);
     return ok ? number : -1;
 }
+
+} // Perforce::Internal

src/plugins/perforce/changenumberdialog.h

@@ -9,8 +9,7 @@ QT_BEGIN_NAMESPACE
 class QLineEdit;
 QT_END_NAMESPACE
 
-namespace Perforce {
+namespace Perforce::Internal {
-namespace Internal {
 
 // Input a change number for pending changes.
 class ChangeNumberDialog : public QDialog
@@ -24,5 +23,4 @@ private:
     QLineEdit *m_lineEdit = nullptr;
 };
 
-} // namespace Perforce
+} // Perforce::Internal
-} // namespace Internal

src/plugins/perforce/pendingchangesdialog.cpp

@@ -3,6 +3,8 @@
 
 #include "pendingchangesdialog.h"
 
+#include "perforcetr.h"
+
 #include <utils/layoutbuilder.h>
 
 #include <QDialogButtonBox>
@@ -11,18 +13,18 @@
 #include <QPushButton>
 #include <QRegularExpression>
 
-using namespace Perforce::Internal;
+namespace Perforce::Internal {
 
 PendingChangesDialog::PendingChangesDialog(const QString &data, QWidget *parent)
     : QDialog(parent)
     , m_listWidget(new QListWidget(this))
 {
-    setWindowTitle(tr("P4 Pending Changes"));
+    setWindowTitle(Tr::tr("P4 Pending Changes"));
 
     QDialogButtonBox *buttonBox = new QDialogButtonBox(this);
     buttonBox->setOrientation(Qt::Horizontal);
     buttonBox->setStandardButtons(QDialogButtonBox::Cancel);
-    QPushButton *submitButton = buttonBox->addButton(tr("Submit"), QDialogButtonBox::AcceptRole);
+    QPushButton *submitButton = buttonBox->addButton(Tr::tr("Submit"), QDialogButtonBox::AcceptRole);
     connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
     connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
 
@@ -32,7 +34,7 @@ PendingChangesDialog::PendingChangesDialog(const QString &data, QWidget *parent)
         QRegularExpressionMatchIterator it = r.globalMatch(data);
         while (it.hasNext()) {
             const QRegularExpressionMatch match = it.next();
-            item = new QListWidgetItem(tr("Change %1: %2").arg(match.captured(1),
+            item = new QListWidgetItem(Tr::tr("Change %1: %2").arg(match.captured(1),
                                                                    match.captured(2).trimmed()),
                                        m_listWidget);
             item->setData(Qt::UserRole, match.captured(1).trimmed());
@@ -65,3 +67,5 @@ int PendingChangesDialog::changeNumber() const
     const int number = item->data(Qt::UserRole).toInt(&ok);
     return ok ? number : -1;
 }
+
+} // Perforce::Internal

src/plugins/perforce/pendingchangesdialog.h

@@ -9,8 +9,7 @@ QT_BEGIN_NAMESPACE
 class QListWidget;
 QT_END_NAMESPACE
 
-namespace Perforce {
+namespace Perforce::Internal {
-namespace Internal {
 
 class PendingChangesDialog : public QDialog
 {
@@ -24,5 +23,4 @@ private:
     QListWidget *m_listWidget = nullptr;
 };
 
-} // namespace Perforce
+} // Perforce::Internal
-} // namespace Internal

src/plugins/perforce/perforcechecker.cpp

@@ -3,6 +3,8 @@
 
 #include "perforcechecker.h"
 
+#include "perforcetr.h"
+
 #include <utils/qtcassert.h>
 
 #include <QApplication>
@@ -56,7 +58,7 @@ void PerforceChecker::start(const FilePath &binary, const FilePath &workingDirec
         return;
     }
     if (binary.isEmpty()) {
-        emitFailed(tr("No executable specified"));
+        emitFailed(Tr::tr("No executable specified"));
         return;
     }
     m_binary = binary;
@@ -87,7 +89,7 @@ void PerforceChecker::slotTimeOut()
     m_timedOut = true;
     m_process.stop();
     m_process.waitForFinished();
-    emitFailed(tr("\"%1\" timed out after %2 ms.").arg(m_binary.toUserOutput()).arg(m_timeOutMS));
+    emitFailed(Tr::tr("\"%1\" timed out after %2 ms.").arg(m_binary.toUserOutput()).arg(m_timeOutMS));
 }
 
 void PerforceChecker::slotDone()
@@ -95,18 +97,18 @@ void PerforceChecker::slotDone()
     if (m_timedOut)
         return;
     if (m_process.error() == QProcess::FailedToStart) {
-        emitFailed(tr("Unable to launch \"%1\": %2").
+        emitFailed(Tr::tr("Unable to launch \"%1\": %2").
                    arg(m_binary.toUserOutput(), m_process.errorString()));
         return;
     }
     switch (m_process.exitStatus()) {
     case QProcess::CrashExit:
-        emitFailed(tr("\"%1\" crashed.").arg(m_binary.toUserOutput()));
+        emitFailed(Tr::tr("\"%1\" crashed.").arg(m_binary.toUserOutput()));
         break;
     case QProcess::NormalExit:
         if (m_process.exitCode()) {
             const QString stdErr = m_process.cleanedStdErr();
-            emitFailed(tr("\"%1\" terminated with exit code %2: %3").
+            emitFailed(Tr::tr("\"%1\" terminated with exit code %2: %3").
                    arg(m_binary.toUserOutput()).arg(m_process.exitCode()).arg(stdErr));
         } else {
             parseOutput(m_process.cleanedStdOut());
@@ -149,7 +151,7 @@ static inline bool clientAndHostAreEqual(const QString &in)
 void PerforceChecker::parseOutput(const QString &response)
 {
     if (!response.contains(QLatin1String("View:")) && !response.contains(QLatin1String("//depot/"))) {
-        emitFailed(tr("The client does not seem to contain any mapped files."));
+        emitFailed(Tr::tr("The client does not seem to contain any mapped files."));
         return;
     }
 
@@ -162,14 +164,14 @@ void PerforceChecker::parseOutput(const QString &response)
     const QString repositoryRoot = clientRootFromOutput(response);
     if (repositoryRoot.isEmpty()) {
         //: Unable to determine root of the p4 client installation
-        emitFailed(tr("Unable to determine the client root."));
+        emitFailed(Tr::tr("Unable to determine the client root."));
         return;
     }
     // Check existence. No precise check here, might be a symlink
     if (QFileInfo::exists(repositoryRoot)) {
         emitSucceeded(repositoryRoot);
     } else {
-        emitFailed(tr("The repository \"%1\" does not exist.").
+        emitFailed(Tr::tr("The repository \"%1\" does not exist.").
                    arg(QDir::toNativeSeparators(repositoryRoot)));
     }
 }

src/plugins/perforce/perforcechecker.h

@@ -6,8 +6,7 @@
 #include <utils/filepath.h>
 #include <utils/qtcprocess.h>
 
-namespace Perforce {
+namespace Perforce::Internal {
-namespace Internal {
 
 // Perforce checker:  Calls perforce asynchronously to do
 // a check of the configuration and emits signals with the top level or
@@ -53,5 +52,4 @@ private:
     bool m_isOverrideCursor = false;
 };
 
-} // namespace Internal
+} // Perforce::Internal
-} // namespace Perforce

src/plugins/perforce/perforceeditor.cpp

@@ -5,25 +5,24 @@
 
 #include "annotationhighlighter.h"
 #include "perforceplugin.h"
+#include "perforcetr.h"
 
 #include <coreplugin/editormanager/editormanager.h>
 #include <utils/qtcassert.h>
 #include <vcsbase/diffandloghighlighter.h>
 
+#include <QAction>
 #include <QDebug>
 #include <QFileInfo>
-#include <QSet>
-#include <QTextStream>
-
-#include <QAction>
 #include <QKeyEvent>
 #include <QMenu>
+#include <QSet>
+#include <QTextBlock>
 #include <QTextCursor>
 #include <QTextEdit>
-#include <QTextBlock>
+#include <QTextStream>
 
-namespace Perforce {
+namespace Perforce::Internal {
-namespace Internal {
 
 // ------------ PerforceEditor
 PerforceEditorWidget::PerforceEditorWidget() :
@@ -37,7 +36,7 @@ PerforceEditorWidget::PerforceEditorWidget() :
     //    +++ P:/XXX\closingkit\trunk\source\cui\src\cui_core.cpp<tab>2012-02-08 13:54:01.000000000 0100
     setDiffFilePattern("^(?:={4}|\\+{3}) (.+)(?:\\t|#\\d)");
     setLogEntryPattern("^... #\\d change (\\d+) ");
-    setAnnotateRevisionTextFormat(tr("Annotate change list \"%1\""));
+    setAnnotateRevisionTextFormat(Tr::tr("Annotate change list \"%1\""));
     setAnnotationEntryPattern("^(\\d+):");
 }
 
@@ -75,5 +74,4 @@ QStringList PerforceEditorWidget::annotationPreviousVersions(const QString &v) c
     return QStringList(QString::number(changeList - 1));
 }
 
-} // namespace Internal
+} // Perforce::Internal
-} // namespace Perforce

src/plugins/perforce/perforceeditor.h

@@ -7,8 +7,7 @@
 
 #include <QRegularExpression>
 
-namespace Perforce {
+namespace Perforce::Internal {
-namespace Internal {
 
 class PerforceEditorWidget : public VcsBase::VcsBaseEditorWidget
 {
@@ -27,5 +26,4 @@ private:
     const QRegularExpression m_changeNumberPattern;
 };
 
-} // namespace Perforce
+} // Perforce::Internal
-} // namespace Internal

src/plugins/perforce/perforceplugin.cpp

@@ -9,6 +9,7 @@
 #include "perforceeditor.h"
 #include "perforcesettings.h"
 #include "perforcesubmiteditor.h"
+#include "perforcetr.h"
 
 #include <coreplugin/actionmanager/actionmanager.h>
 #include <coreplugin/actionmanager/actioncontainer.h>
@@ -183,8 +184,6 @@ struct PerforceDiffParameters
 
 class PerforcePluginPrivate final : public VcsBasePluginPrivate
 {
-    Q_DECLARE_TR_FUNCTIONS(Perforce::Internal::PerforcePlugin)
-
 public:
     PerforcePluginPrivate();
 
@@ -380,108 +379,108 @@ PerforcePluginPrivate::PerforcePluginPrivate()
 
     const QString prefix = QLatin1String("p4");
     m_commandLocator = new CommandLocator("Perforce", prefix, prefix, this);
-    m_commandLocator->setDescription(tr("Triggers a Perforce version control operation."));
+    m_commandLocator->setDescription(Tr::tr("Triggers a Perforce version control operation."));
 
     ActionContainer *mtools = ActionManager::actionContainer(Core::Constants::M_TOOLS);
 
     ActionContainer *perforceContainer = ActionManager::createMenu(CMD_ID_PERFORCE_MENU);
-    perforceContainer->menu()->setTitle(tr("&Perforce"));
+    perforceContainer->menu()->setTitle(Tr::tr("&Perforce"));
     mtools->addMenu(perforceContainer);
     m_menuAction = perforceContainer->menu()->menuAction();
 
     Command *command;
 
-    m_diffFileAction = new ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this);
+    m_diffFileAction = new ParameterAction(Tr::tr("Diff Current File"), Tr::tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this);
     command = ActionManager::registerAction(m_diffFileAction, CMD_ID_DIFF_CURRENT, context);
     command->setAttribute(Command::CA_UpdateText);
-    command->setDescription(tr("Diff Current File"));
+    command->setDescription(Tr::tr("Diff Current File"));
     connect(m_diffFileAction, &QAction::triggered, this, &PerforcePluginPrivate::diffCurrentFile);
     perforceContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
-    m_annotateCurrentAction = new ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), ParameterAction::EnabledWithParameter, this);
+    m_annotateCurrentAction = new ParameterAction(Tr::tr("Annotate Current File"), Tr::tr("Annotate \"%1\""), ParameterAction::EnabledWithParameter, this);
     command = ActionManager::registerAction(m_annotateCurrentAction, CMD_ID_ANNOTATE_CURRENT, context);
     command->setAttribute(Command::CA_UpdateText);
-    command->setDescription(tr("Annotate Current File"));
+    command->setDescription(Tr::tr("Annotate Current File"));
     connect(m_annotateCurrentAction, &QAction::triggered, this, &PerforcePluginPrivate::annotateCurrentFile);
     perforceContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
-    m_filelogCurrentAction = new ParameterAction(tr("Filelog Current File"), tr("Filelog \"%1\""), ParameterAction::EnabledWithParameter, this);
+    m_filelogCurrentAction = new ParameterAction(Tr::tr("Filelog Current File"), Tr::tr("Filelog \"%1\""), ParameterAction::EnabledWithParameter, this);
     command = ActionManager::registerAction(m_filelogCurrentAction, CMD_ID_FILELOG_CURRENT, context);
     command->setAttribute(Command::CA_UpdateText);
-    command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+P,Meta+F") : tr("Alt+P,Alt+F")));
+    command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+P,Meta+F") : Tr::tr("Alt+P,Alt+F")));
-    command->setDescription(tr("Filelog Current File"));
+    command->setDescription(Tr::tr("Filelog Current File"));
     connect(m_filelogCurrentAction, &QAction::triggered, this, &PerforcePluginPrivate::filelogCurrentFile);
     perforceContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
     perforceContainer->addSeparator(context);
 
-    m_editAction = new ParameterAction(tr("Edit"), tr("Edit \"%1\""), ParameterAction::EnabledWithParameter, this);
+    m_editAction = new ParameterAction(Tr::tr("Edit"), Tr::tr("Edit \"%1\""), ParameterAction::EnabledWithParameter, this);
     command = ActionManager::registerAction(m_editAction, CMD_ID_EDIT, context);
     command->setAttribute(Command::CA_UpdateText);
-    command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+P,Meta+E") : tr("Alt+P,Alt+E")));
+    command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+P,Meta+E") : Tr::tr("Alt+P,Alt+E")));
-    command->setDescription(tr("Edit File"));
+    command->setDescription(Tr::tr("Edit File"));
     connect(m_editAction, &QAction::triggered, this, &PerforcePluginPrivate::openCurrentFile);
     perforceContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
-    m_addAction = new ParameterAction(tr("Add"), tr("Add \"%1\""), ParameterAction::EnabledWithParameter, this);
+    m_addAction = new ParameterAction(Tr::tr("Add"), Tr::tr("Add \"%1\""), ParameterAction::EnabledWithParameter, this);
     command = ActionManager::registerAction(m_addAction, CMD_ID_ADD, context);
     command->setAttribute(Command::CA_UpdateText);
-    command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+P,Meta+A") : tr("Alt+P,Alt+A")));
+    command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+P,Meta+A") : Tr::tr("Alt+P,Alt+A")));
-    command->setDescription(tr("Add File"));
+    command->setDescription(Tr::tr("Add File"));
     connect(m_addAction, &QAction::triggered, this, &PerforcePluginPrivate::addCurrentFile);
     perforceContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
-    m_deleteAction = new ParameterAction(tr("Delete..."), tr("Delete \"%1\"..."), ParameterAction::EnabledWithParameter, this);
+    m_deleteAction = new ParameterAction(Tr::tr("Delete..."), Tr::tr("Delete \"%1\"..."), ParameterAction::EnabledWithParameter, this);
     command = ActionManager::registerAction(m_deleteAction, CMD_ID_DELETE_FILE, context);
     command->setAttribute(Command::CA_UpdateText);
-    command->setDescription(tr("Delete File"));
+    command->setDescription(Tr::tr("Delete File"));
     connect(m_deleteAction, &QAction::triggered, this, &PerforcePluginPrivate::promptToDeleteCurrentFile);
     perforceContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
-    m_revertFileAction = new ParameterAction(tr("Revert"), tr("Revert \"%1\""), ParameterAction::EnabledWithParameter, this);
+    m_revertFileAction = new ParameterAction(Tr::tr("Revert"), Tr::tr("Revert \"%1\""), ParameterAction::EnabledWithParameter, this);
     command = ActionManager::registerAction(m_revertFileAction, CMD_ID_REVERT, context);
     command->setAttribute(Command::CA_UpdateText);
-    command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+P,Meta+R") : tr("Alt+P,Alt+R")));
+    command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+P,Meta+R") : Tr::tr("Alt+P,Alt+R")));
-    command->setDescription(tr("Revert File"));
+    command->setDescription(Tr::tr("Revert File"));
     connect(m_revertFileAction, &QAction::triggered, this, &PerforcePluginPrivate::revertCurrentFile);
     perforceContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
     perforceContainer->addSeparator(context);
 
-    const QString diffProjectDefaultText = tr("Diff Current Project/Session");
+    const QString diffProjectDefaultText = Tr::tr("Diff Current Project/Session");
-    m_diffProjectAction = new ParameterAction(diffProjectDefaultText, tr("Diff Project \"%1\""), ParameterAction::AlwaysEnabled, this);
+    m_diffProjectAction = new ParameterAction(diffProjectDefaultText, Tr::tr("Diff Project \"%1\""), ParameterAction::AlwaysEnabled, this);
     command = ActionManager::registerAction(m_diffProjectAction, CMD_ID_DIFF_PROJECT, context);
     command->setAttribute(Command::CA_UpdateText);
-    command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+P,Meta+D") : tr("Alt+P,Alt+D")));
+    command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+P,Meta+D") : Tr::tr("Alt+P,Alt+D")));
     command->setDescription(diffProjectDefaultText);
     connect(m_diffProjectAction, &QAction::triggered, this, &PerforcePluginPrivate::diffCurrentProject);
     perforceContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
-    m_logProjectAction = new ParameterAction(tr("Log Project"), tr("Log Project \"%1\""), ParameterAction::EnabledWithParameter, this);
+    m_logProjectAction = new ParameterAction(Tr::tr("Log Project"), Tr::tr("Log Project \"%1\""), ParameterAction::EnabledWithParameter, this);
     command = ActionManager::registerAction(m_logProjectAction, CMD_ID_PROJECTLOG, context);
     command->setAttribute(Command::CA_UpdateText);
     connect(m_logProjectAction, &QAction::triggered, this, &PerforcePluginPrivate::logProject);
     perforceContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
-    m_submitProjectAction = new ParameterAction(tr("Submit Project"), tr("Submit Project \"%1\""), ParameterAction::EnabledWithParameter, this);
+    m_submitProjectAction = new ParameterAction(Tr::tr("Submit Project"), Tr::tr("Submit Project \"%1\""), ParameterAction::EnabledWithParameter, this);
     command = ActionManager::registerAction(m_submitProjectAction, CMD_ID_SUBMIT, context);
     command->setAttribute(Command::CA_UpdateText);
-    command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+P,Meta+S") : tr("Alt+P,Alt+S")));
+    command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+P,Meta+S") : Tr::tr("Alt+P,Alt+S")));
     connect(m_submitProjectAction, &QAction::triggered, this, &PerforcePluginPrivate::startSubmitProject);
     perforceContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
-    const QString updateProjectDefaultText = tr("Update Current Project");
+    const QString updateProjectDefaultText = Tr::tr("Update Current Project");
-    m_updateProjectAction = new ParameterAction(updateProjectDefaultText, tr("Update Project \"%1\""), ParameterAction::AlwaysEnabled, this);
+    m_updateProjectAction = new ParameterAction(updateProjectDefaultText, Tr::tr("Update Project \"%1\""), ParameterAction::AlwaysEnabled, this);
     command = ActionManager::registerAction(m_updateProjectAction, CMD_ID_UPDATE_PROJECT, context);
     command->setDescription(updateProjectDefaultText);
     command->setAttribute(Command::CA_UpdateText);
@@ -489,14 +488,14 @@ PerforcePluginPrivate::PerforcePluginPrivate()
     perforceContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
-    m_revertUnchangedAction = new ParameterAction(tr("Revert Unchanged"), tr("Revert Unchanged Files of Project \"%1\""), ParameterAction::EnabledWithParameter, this);
+    m_revertUnchangedAction = new ParameterAction(Tr::tr("Revert Unchanged"), Tr::tr("Revert Unchanged Files of Project \"%1\""), ParameterAction::EnabledWithParameter, this);
     command = ActionManager::registerAction(m_revertUnchangedAction, CMD_ID_REVERT_UNCHANGED_PROJECT, context);
     command->setAttribute(Command::CA_UpdateText);
     connect(m_revertUnchangedAction, &QAction::triggered, this, &PerforcePluginPrivate::revertUnchangedCurrentProject);
     perforceContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
-    m_revertProjectAction = new ParameterAction(tr("Revert Project"), tr("Revert Project \"%1\""), ParameterAction::EnabledWithParameter, this);
+    m_revertProjectAction = new ParameterAction(Tr::tr("Revert Project"), Tr::tr("Revert Project \"%1\""), ParameterAction::EnabledWithParameter, this);
     command = ActionManager::registerAction(m_revertProjectAction, CMD_ID_REVERT_PROJECT, context);
     command->setAttribute(Command::CA_UpdateText);
     connect(m_revertProjectAction, &QAction::triggered, this, &PerforcePluginPrivate::revertCurrentProject);
@@ -505,32 +504,32 @@ PerforcePluginPrivate::PerforcePluginPrivate()
 
     perforceContainer->addSeparator(context);
 
-    m_diffAllAction = new QAction(tr("Diff Opened Files"), this);
+    m_diffAllAction = new QAction(Tr::tr("Diff Opened Files"), this);
     command = ActionManager::registerAction(m_diffAllAction, CMD_ID_DIFF_ALL, context);
     connect(m_diffAllAction, &QAction::triggered, this, &PerforcePluginPrivate::diffAllOpened);
     perforceContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
-    m_openedAction = new QAction(tr("Opened"), this);
+    m_openedAction = new QAction(Tr::tr("Opened"), this);
     command = ActionManager::registerAction(m_openedAction, CMD_ID_OPENED, context);
-    command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+P,Meta+O") : tr("Alt+P,Alt+O")));
+    command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+P,Meta+O") : Tr::tr("Alt+P,Alt+O")));
     connect(m_openedAction, &QAction::triggered, this, &PerforcePluginPrivate::printOpenedFileList);
     perforceContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
-    m_logRepositoryAction = new QAction(tr("Repository Log"), this);
+    m_logRepositoryAction = new QAction(Tr::tr("Repository Log"), this);
     command = ActionManager::registerAction(m_logRepositoryAction, CMD_ID_REPOSITORYLOG, context);
     connect(m_logRepositoryAction, &QAction::triggered, this, &PerforcePluginPrivate::logRepository);
     perforceContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
-    m_pendingAction = new QAction(tr("Pending Changes..."), this);
+    m_pendingAction = new QAction(Tr::tr("Pending Changes..."), this);
     command = ActionManager::registerAction(m_pendingAction, CMD_ID_PENDING_CHANGES, context);
     connect(m_pendingAction, &QAction::triggered, this, &PerforcePluginPrivate::printPendingChanges);
     perforceContainer->addAction(command);
     m_commandLocator->appendCommand(command);
 
-    m_updateAllAction = new QAction(tr("Update All"), this);
+    m_updateAllAction = new QAction(Tr::tr("Update All"), this);
     command = ActionManager::registerAction(m_updateAllAction, CMD_ID_UPDATEALL, context);
     connect(m_updateAllAction, &QAction::triggered, this, &PerforcePluginPrivate::updateAll);
     perforceContainer->addAction(command);
@@ -538,17 +537,17 @@ PerforcePluginPrivate::PerforcePluginPrivate()
 
     perforceContainer->addSeparator(context);
 
-    m_describeAction = new QAction(tr("Describe..."), this);
+    m_describeAction = new QAction(Tr::tr("Describe..."), this);
     command = ActionManager::registerAction(m_describeAction, CMD_ID_DESCRIBE, context);
     connect(m_describeAction, &QAction::triggered, this, &PerforcePluginPrivate::describeChange);
     perforceContainer->addAction(command);
 
-    m_annotateAction = new QAction(tr("Annotate..."), this);
+    m_annotateAction = new QAction(Tr::tr("Annotate..."), this);
     command = ActionManager::registerAction(m_annotateAction, CMD_ID_ANNOTATE, context);
     connect(m_annotateAction, &QAction::triggered, this, &PerforcePluginPrivate::annotateFile);
     perforceContainer->addAction(command);
 
-    m_filelogAction = new QAction(tr("Filelog..."), this);
+    m_filelogAction = new QAction(Tr::tr("Filelog..."), this);
     command = ActionManager::registerAction(m_filelogAction, CMD_ID_FILELOG, context);
     connect(m_filelogAction, &QAction::triggered, this, &PerforcePluginPrivate::filelogFile);
     perforceContainer->addAction(command);
@@ -599,8 +598,8 @@ void PerforcePluginPrivate::revertCurrentFile()
 
     bool doNotRevert = false;
     if (!result.stdOut.isEmpty())
-        doNotRevert = (QMessageBox::warning(ICore::dialogParent(), tr("p4 revert"),
+        doNotRevert = (QMessageBox::warning(ICore::dialogParent(), Tr::tr("p4 revert"),
-                                            tr("The file has been changed. Do you want to revert it?"),
+                                            Tr::tr("The file has been changed. Do you want to revert it?"),
                                             QMessageBox::Yes, QMessageBox::No) == QMessageBox::No);
     if (doNotRevert)
         return;
@@ -650,8 +649,8 @@ void PerforcePluginPrivate::revertCurrentProject()
     const VcsBasePluginState state = currentState();
     QTC_ASSERT(state.hasProject(), return);
 
-    const QString msg = tr("Do you want to revert all changes to the project \"%1\"?").arg(state.currentProjectName());
+    const QString msg = Tr::tr("Do you want to revert all changes to the project \"%1\"?").arg(state.currentProjectName());
-    if (QMessageBox::warning(ICore::dialogParent(), tr("p4 revert"), msg, QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
+    if (QMessageBox::warning(ICore::dialogParent(), Tr::tr("p4 revert"), msg, QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
         return;
     revertProject(state.currentProjectTopLevel(), perforceRelativeProjectDirectory(state), false);
 }
@@ -724,7 +723,7 @@ void PerforcePluginPrivate::startSubmitProject()
         return;
 
     if (isCommitEditorOpen()) {
-        VcsOutputWindow::appendWarning(tr("Another submit is currently executed."));
+        VcsOutputWindow::appendWarning(Tr::tr("Another submit is currently executed."));
         return;
     }
 
@@ -771,7 +770,7 @@ void PerforcePluginPrivate::startSubmitProject()
         depotFileNames.append(line.left(line.lastIndexOf(QRegularExpression("#[0-9]+\\s-\\s"))));
     }
     if (depotFileNames.isEmpty()) {
-        VcsOutputWindow::appendWarning(tr("Project has no files"));
+        VcsOutputWindow::appendWarning(Tr::tr("Project has no files"));
         cleanCommitMessageFile();
         return;
     }
@@ -822,7 +821,7 @@ void PerforcePluginPrivate::annotateCurrentFile()
 
 void PerforcePluginPrivate::annotateFile()
 {
-    const FilePath filePath = FileUtils::getOpenFilePath(nullptr, tr("p4 annotate"));
+    const FilePath filePath = FileUtils::getOpenFilePath(nullptr, Tr::tr("p4 annotate"));
     if (!filePath.isEmpty())
         annotate(filePath.parentDir(), filePath.fileName());
 }
@@ -848,7 +847,7 @@ void PerforcePluginPrivate::annotate(const FilePath &workingDir,
     if (!result.error) {
         if (lineNumber < 1)
             lineNumber = VcsBaseEditor::lineNumberOfCurrentEditor();
-        IEditor *ed = showOutputInEditor(tr("p4 annotate %1").arg(id),
+        IEditor *ed = showOutputInEditor(Tr::tr("p4 annotate %1").arg(id),
                                          result.stdOut, annotateEditorParameters.id,
                                          source, codec);
         VcsBaseEditor::gotoLineOfEditor(ed, lineNumber);
@@ -864,7 +863,7 @@ void PerforcePluginPrivate::filelogCurrentFile()
 
 void PerforcePluginPrivate::filelogFile()
 {
-    const FilePath file = FileUtils::getOpenFilePath(nullptr, tr("p4 filelog"));
+    const FilePath file = FileUtils::getOpenFilePath(nullptr, Tr::tr("p4 filelog"));
     if (!file.isEmpty())
         filelog(file.parentDir(), file.fileName());
 }
@@ -899,7 +898,7 @@ void PerforcePluginPrivate::filelog(const FilePath &workingDir, const QString &f
                                              {}, {}, codec);
     if (!result.error) {
         const QString source = VcsBaseEditor::getSource(workingDir, fileName);
-        IEditor *editor = showOutputInEditor(tr("p4 filelog %1").arg(id), result.stdOut,
+        IEditor *editor = showOutputInEditor(Tr::tr("p4 filelog %1").arg(id), result.stdOut,
                                              logEditorParameters.id, source, codec);
         if (enableAnnotationContextMenu)
             VcsBaseEditor::getVcsBaseEditor(editor)->setFileLogAnnotateEnabled(true);
@@ -921,7 +920,7 @@ void PerforcePluginPrivate::changelists(const FilePath &workingDir, const QStrin
                                              {}, {}, codec);
     if (!result.error) {
         const QString source = VcsBaseEditor::getSource(workingDir, fileName);
-        IEditor *editor = showOutputInEditor(tr("p4 changelists %1").arg(id), result.stdOut,
+        IEditor *editor = showOutputInEditor(Tr::tr("p4 changelists %1").arg(id), result.stdOut,
                                              logEditorParameters.id, source, codec);
         VcsBaseEditor::gotoLineOfEditor(editor, 1);
     }
@@ -1186,34 +1185,34 @@ void PerforcePluginPrivate::vcsAnnotate(const FilePath &filePath, int line)
 
 QString PerforcePluginPrivate::vcsOpenText() const
 {
-    return tr("&Edit");
+    return Tr::tr("&Edit");
 }
 
 QString PerforcePluginPrivate::vcsMakeWritableText() const
 {
-    return tr("&Hijack");
+    return Tr::tr("&Hijack");
 }
 
 // Run messages
 
-static inline QString msgNotStarted(const QString &cmd)
+static QString msgNotStarted(const QString &cmd)
 {
-    return PerforcePluginPrivate::tr("Could not start perforce \"%1\". Please check your settings in the preferences.").arg(cmd);
+    return Tr::tr("Could not start perforce \"%1\". Please check your settings in the preferences.").arg(cmd);
 }
 
-static inline QString msgTimeout(int timeOutS)
+static QString msgTimeout(int timeOutS)
 {
-    return PerforcePluginPrivate::tr("Perforce did not respond within timeout limit (%1 s).").arg(timeOutS);
+    return Tr::tr("Perforce did not respond within timeout limit (%1 s).").arg(timeOutS);
 }
 
-static inline QString msgCrash()
+static QString msgCrash()
 {
-    return PerforcePluginPrivate::tr("The process terminated abnormally.");
+    return Tr::tr("The process terminated abnormally.");
 }
 
-static inline QString msgExitCode(int ex)
+static QString msgExitCode(int ex)
 {
-    return PerforcePluginPrivate::tr("The process terminated with exit code %1.").arg(ex);
+    return Tr::tr("The process terminated with exit code %1.").arg(ex);
 }
 
 // Run using a SynchronousProcess, emitting signals to the message window
@@ -1343,7 +1342,7 @@ PerforceResponse PerforcePluginPrivate::runP4Cmd(const FilePath &workingDir,
     if (!m_settings.isValid()) {
         PerforceResponse invalidConfigResponse;
         invalidConfigResponse.error = true;
-        invalidConfigResponse.message = tr("Perforce is not correctly configured.");
+        invalidConfigResponse.message = Tr::tr("Perforce is not correctly configured.");
         VcsOutputWindow::appendError(invalidConfigResponse.message);
         return invalidConfigResponse;
     }
@@ -1390,7 +1389,7 @@ IEditor *PerforcePluginPrivate::showOutputInEditor(const QString &title,
     if (content.size() >= maxSize) {
         content = content.left(maxSize);
         content += QLatin1Char('\n')
-                   + tr("[Only %n MB of output shown]", nullptr, maxSize / 1024 / 1024);
+                   + Tr::tr("[Only %n MB of output shown]", nullptr, maxSize / 1024 / 1024);
     }
     IEditor *editor = EditorManager::openEditorWithContents(id, &s, content.toUtf8());
     QTC_ASSERT(editor, return nullptr);
@@ -1431,7 +1430,7 @@ PerforceDiffConfig::PerforceDiffConfig(const PerforceDiffParameters &p, QToolBar
     VcsBaseEditorConfig(toolBar), m_parameters(p)
 {
     setBaseArguments(p.diffArguments);
-    addToggleButton(QLatin1String("w"), tr("Ignore Whitespace"));
+    addToggleButton(QLatin1String("w"), Tr::tr("Ignore Whitespace"));
     connect(this, &VcsBaseEditorConfig::argumentsChanged, this, &PerforceDiffConfig::triggerReRun);
 }
 
@@ -1444,7 +1443,7 @@ void PerforceDiffConfig::triggerReRun()
 
 QString PerforcePluginPrivate::commitDisplayName() const
 {
-    return tr("Submit");
+    return Tr::tr("Submit");
 }
 
 void PerforcePluginPrivate::p4Diff(const FilePath &workingDir, const QStringList &files)
@@ -1484,7 +1483,7 @@ void PerforcePluginPrivate::p4Diff(const PerforceDiffParameters &p)
         return;
     }
     // Create new editor
-    IEditor *editor = showOutputInEditor(tr("p4 diff %1").arg(id), result.stdOut,
+    IEditor *editor = showOutputInEditor(Tr::tr("p4 diff %1").arg(id), result.stdOut,
                                          diffEditorParameters.id,
                                          VcsBaseEditor::getSource(p.workingDir, p.files),
                                          codec);
@@ -1509,7 +1508,7 @@ void PerforcePluginPrivate::vcsDescribe(const FilePath &source, const QString &n
     const PerforceResponse result = runP4Cmd(m_settings.topLevel(), args, CommandToWindow|StdErrToWindow|ErrorToWindow,
                                              {}, {}, codec);
     if (!result.error)
-        showOutputInEditor(tr("p4 describe %1").arg(n), result.stdOut, diffEditorParameters.id, source.toString(), codec);
+        showOutputInEditor(Tr::tr("p4 describe %1").arg(n), result.stdOut, diffEditorParameters.id, source.toString(), codec);
 }
 
 void PerforcePluginPrivate::cleanCommitMessageFile()
@@ -1550,12 +1549,12 @@ bool PerforcePluginPrivate::activateCommit()
                                                      LongTimeOut|RunFullySynchronous|CommandToWindow|StdErrToWindow|ErrorToWindow|ShowBusyCursor,
                                                      {}, reader.data());
     if (submitResponse.error) {
-        VcsOutputWindow::appendError(tr("p4 submit failed: %1").arg(submitResponse.message));
+        VcsOutputWindow::appendError(Tr::tr("p4 submit failed: %1").arg(submitResponse.message));
         return false;
     }
     VcsOutputWindow::append(submitResponse.stdOut);
     if (submitResponse.stdOut.contains(QLatin1String("Out of date files must be resolved or reverted)")))
-        QMessageBox::warning(perforceEditor->widget(), tr("Pending change"), tr("Could not submit the change, because your workspace was out of date. Created a pending submit instead."));
+        QMessageBox::warning(perforceEditor->widget(), Tr::tr("Pending change"), Tr::tr("Could not submit the change, because your workspace was out of date. Created a pending submit instead."));
 
     cleanCommitMessageFile();
     return true;
@@ -1600,11 +1599,11 @@ QString PerforcePluginPrivate::pendingChangesData()
     return dataResponse.error ? QString() : dataResponse.stdOut;
 }
 
-static inline QString msgWhereFailed(const QString & file, const QString &why)
+static QString msgWhereFailed(const QString & file, const QString &why)
 {
     //: Failed to run p4 "where" to resolve a Perforce file name to a local
     //: file system name.
-    return PerforcePluginPrivate::tr("Error running \"where\" on %1: %2").
+    return Tr::Tr::tr("Error running \"where\" on %1: %2").
             arg(QDir::toNativeSeparators(file), why);
 }
 
@@ -1636,7 +1635,7 @@ QString PerforcePlugin::fileNameFromPerforceName(const QString& perforceName,
 
     if (output.isEmpty()) {
         //: File is not managed by Perforce
-        *errorMessage = msgWhereFailed(perforceName, tr("The file is not mapped"));
+        *errorMessage = msgWhereFailed(perforceName, Tr::tr("The file is not mapped"));
         return QString();
     }
     const QString p4fileSpec = output.mid(output.lastIndexOf(QLatin1Char(' ')) + 1);
@@ -1650,7 +1649,7 @@ void PerforcePluginPrivate::setTopLevel(const FilePath &topLevel)
 
     m_settings.setTopLevel(topLevel.toString());
 
-    const QString msg = tr("Perforce repository: %1").arg(topLevel.toUserOutput());
+    const QString msg = Tr::tr("Perforce repository: %1").arg(topLevel.toUserOutput());
     VcsOutputWindow::appendSilently(msg);
 }
 
@@ -1664,7 +1663,7 @@ void PerforcePluginPrivate::applySettings()
 
 void PerforcePluginPrivate::slotTopLevelFailed(const QString &errorMessage)
 {
-    VcsOutputWindow::appendSilently(tr("Perforce: Unable to determine the repository: %1").arg(errorMessage));
+    VcsOutputWindow::appendSilently(Tr::tr("Perforce: Unable to determine the repository: %1").arg(errorMessage));
 }
 
 void PerforcePluginPrivate::getTopLevel(const FilePath &workingDirectory, bool isSync)

src/plugins/perforce/perforceplugin.h

@@ -5,8 +5,7 @@
 
 #include <extensionsystem/iplugin.h>
 
-namespace Perforce {
+namespace Perforce::Internal {
-namespace Internal {
 
 class PerforcePlugin final : public ExtensionSystem::IPlugin
 {
@@ -30,5 +29,4 @@ private slots:
 #endif
 };
 
-} // namespace Perforce
+} // Perforce::Internal
-} // namespace Internal

src/plugins/perforce/perforcesettings.cpp

@@ -4,7 +4,7 @@
 #include "perforcesettings.h"
 
 #include "perforcechecker.h"
-#include "perforceplugin.h"
+#include "perforcetr.h"
 
 #include <utils/environment.h>
 #include <utils/hostosinfo.h>
@@ -22,8 +22,7 @@
 
 using namespace Utils;
 
-namespace Perforce {
+namespace Perforce::Internal {
-namespace Internal {
 
 static QString defaultCommand()
 {
@@ -42,29 +41,29 @@ PerforceSettings::PerforceSettings()
             Environment::systemEnvironment().searchInPath(defaultCommand()).toString());
     p4BinaryPath.setHistoryCompleter("Perforce.Command.History");
     p4BinaryPath.setExpectedKind(PathChooser::Command);
-    p4BinaryPath.setDisplayName(tr("Perforce Command"));
+    p4BinaryPath.setDisplayName(Tr::tr("Perforce Command"));
-    p4BinaryPath.setLabelText(tr("P4 command:"));
+    p4BinaryPath.setLabelText(Tr::tr("P4 command:"));
 
     registerAspect(&p4Port);
     p4Port.setDisplayStyle(StringAspect::LineEditDisplay);
     p4Port.setSettingsKey("Port");
-    p4Port.setLabelText(tr("P4 port:"));
+    p4Port.setLabelText(Tr::tr("P4 port:"));
 
     registerAspect(&p4Client);
     p4Client.setDisplayStyle(StringAspect::LineEditDisplay);
     p4Client.setSettingsKey("Client");
-    p4Client.setLabelText(tr("P4 client:"));
+    p4Client.setLabelText(Tr::tr("P4 client:"));
 
     registerAspect(&p4User);
     p4User.setDisplayStyle(StringAspect::LineEditDisplay);
     p4User.setSettingsKey("User");
-    p4User.setLabelText(tr("P4 user:"));
+    p4User.setLabelText(Tr::tr("P4 user:"));
 
     registerAspect(&logCount);
     logCount.setSettingsKey("LogCount");
     logCount.setRange(1000, 10000);
     logCount.setDefaultValue(1000);
-    logCount.setLabelText(tr("Log count:"));
+    logCount.setLabelText(Tr::tr("Log count:"));
 
     registerAspect(&customEnv);
     // The settings value has been stored with the opposite meaning for a while.
@@ -78,13 +77,13 @@ PerforceSettings::PerforceSettings()
     timeOutS.setSettingsKey("TimeOut");
     timeOutS.setRange(1, 360);
     timeOutS.setDefaultValue(30);
-    timeOutS.setLabelText(tr("Timeout:"));
+    timeOutS.setLabelText(Tr::tr("Timeout:"));
-    timeOutS.setSuffix(tr("s"));
+    timeOutS.setSuffix(Tr::tr("s"));
 
     registerAspect(&autoOpen);
     autoOpen.setSettingsKey("PromptToOpen");
     autoOpen.setDefaultValue(true);
-    autoOpen.setLabelText(tr("Automatically open files when editing"));
+    autoOpen.setLabelText(Tr::tr("Automatically open files when editing"));
 }
 
 // --------------------PerforceSettings
@@ -203,7 +202,7 @@ QString PerforceSettings::mapToFileSystem(const QString &perforceFilePath) const
 PerforceSettingsPage::PerforceSettingsPage(PerforceSettings *settings)
 {
     setId(VcsBase::Constants::VCS_ID_PERFORCE);
-    setDisplayName(PerforceSettings::tr("Perforce"));
+    setDisplayName(Tr::tr("Perforce"));
     setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
     setSettings(settings);
 
@@ -212,7 +211,7 @@ PerforceSettingsPage::PerforceSettingsPage(PerforceSettings *settings)
         using namespace Layouting;
 
         auto errorLabel = new QLabel;
-        auto testButton = new QPushButton(PerforceSettings::tr("Test"));
+        auto testButton = new QPushButton(Tr::tr("Test"));
         connect(testButton, &QPushButton::clicked, this, [settings, errorLabel, testButton] {
             testButton->setEnabled(false);
             auto checker = new PerforceChecker(errorLabel);
@@ -227,29 +226,29 @@ PerforceSettingsPage::PerforceSettingsPage(PerforceSettings *settings)
             connect(checker, &PerforceChecker::succeeded, errorLabel,
                     [errorLabel, testButton, checker](const FilePath &repo) {
                 errorLabel->setStyleSheet({});
-                errorLabel->setText(PerforceSettings::tr("Test succeeded (%1).")
+                errorLabel->setText(Tr::tr("Test succeeded (%1).")
                                         .arg(repo.toUserOutput()));
                 testButton->setEnabled(true);
                 checker->deleteLater();
             });
 
             errorLabel->setStyleSheet(QString());
-            errorLabel->setText(PerforceSettings::tr("Testing..."));
+            errorLabel->setText(Tr::tr("Testing..."));
             checker->start(settings->p4BinaryPath.filePath(), {}, settings->commonP4Arguments(), 10000);
         });
 
         Group config {
-            title(PerforceSettings::tr("Configuration")),
+            title(Tr::tr("Configuration")),
             Row { s.p4BinaryPath }
         };
 
         Group environment {
-            title(PerforceSettings::tr("Environment Variables"), &s.customEnv),
+            title(Tr::tr("Environment Variables"), &s.customEnv),
             Row { s.p4Port, s.p4Client, s.p4User }
         };
 
         Group misc {
-            title(PerforceSettings::tr("Miscellaneous")),
+            title(Tr::tr("Miscellaneous")),
             Column {
                 Row { s.logCount, s.timeOutS, st },
                 s.autoOpen
@@ -266,5 +265,4 @@ PerforceSettingsPage::PerforceSettingsPage(PerforceSettings *settings)
     });
 }
 
-} // Internal
+} // Perforce::Internal
-} // Perforce

src/plugins/perforce/perforcesettings.h

@@ -11,8 +11,7 @@ QT_BEGIN_NAMESPACE
 class QDir;
 QT_END_NAMESPACE
 
-namespace Perforce {
+namespace Perforce::Internal {
-namespace Internal {
 
 /* PerforceSettings: Aggregates settings items and toplevel directory
  * which is determined externally by background checks and provides a convenience
@@ -30,8 +29,6 @@ namespace Internal {
 
 class PerforceSettings : public Utils::AspectContainer
 {
-    Q_DECLARE_TR_FUNCTIONS(Perforce::Internal::SettingsPage)
-
 public:
     PerforceSettings();
     ~PerforceSettings();
@@ -92,5 +89,4 @@ public:
     explicit PerforceSettingsPage(PerforceSettings *settings);
 };
 
-} // namespace Internal
+} // Perforce::Internal
-} // namespace Perforce

src/plugins/perforce/perforcesubmiteditor.cpp

@@ -3,7 +3,7 @@
 
 #include "perforcesubmiteditor.h"
 #include "perforcesubmiteditorwidget.h"
-#include "perforceplugin.h"
+#include "perforcetr.h"
 
 #include <coreplugin/idocument.h>
 #include <vcsbase/submitfilemodel.h>
@@ -11,8 +11,7 @@
 
 #include <QRegularExpression>
 
-namespace Perforce {
+namespace Perforce::Internal {
-namespace Internal {
 
 enum { FileSpecRole = Qt::UserRole + 1 };
 
@@ -20,7 +19,7 @@ PerforceSubmitEditor::PerforceSubmitEditor() :
     VcsBaseSubmitEditor(new PerforceSubmitEditorWidget),
     m_fileModel(new VcsBase::SubmitFileModel(this))
 {
-    document()->setPreferredDisplayName(tr("Perforce Submit"));
+    document()->setPreferredDisplayName(Tr::tr("Perforce Submit"));
     setFileModel(m_fileModel);
 }
 
@@ -139,5 +138,4 @@ void PerforceSubmitEditor::updateEntries()
     m_entries.insert(QLatin1String("Files"), files);
 }
 
-} // Internal
+} // Perforce::Internal
-} // Perforce

src/plugins/perforce/perforcesubmiteditor.h

@@ -10,8 +10,7 @@
 
 namespace VcsBase { class SubmitFileModel; }
 
-namespace Perforce {
+namespace Perforce::Internal {
-namespace Internal {
 
 class PerforceSubmitEditorWidget;
 class PerforcePluginPrivate;
@@ -50,5 +49,4 @@ private:
     VcsBase::SubmitFileModel *m_fileModel;
 };
 
-} // namespace Internal
+} // Perforce::Internal
-} // namespace Perforce

src/plugins/perforce/perforcesubmiteditorwidget.cpp

@@ -3,10 +3,12 @@
 
 #include "perforcesubmiteditorwidget.h"
 
+#include "perforcetr.h"
+
 #include <utils/layoutbuilder.h>
 
-#include <QtWidgets/QGroupBox>
+#include <QGroupBox>
-#include <QtWidgets/QLabel>
+#include <QLabel>
 
 using namespace Utils;
 
@@ -22,14 +24,14 @@ public:
     {
         resize(402, 134);
         setFlat(true);
-        setTitle(tr("Submit"));
+        setTitle(Tr::tr("Submit"));
 
         using namespace Layouting;
 
         Form {
-            tr("Change:"), m_changeNumber, br,
+            Tr::tr("Change:"), m_changeNumber, br,
-            tr("Client:"), m_clientName, br,
+            Tr::tr("Client:"), m_clientName, br,
-            tr("User:"), m_userName
+            Tr::tr("User:"), m_userName
         }.attachTo(this);
     }
 

src/plugins/perforce/perforcetr.h

@@ -12,4 +12,4 @@ struct Tr
     Q_DECLARE_TR_FUNCTIONS(::Perforce)
 };
 
-} // namespace Perforce
+} // Perforce