diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 82894db6838..c3ae4c4dba1 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -8718,34 +8718,7 @@ ve svém .pro souboru. - Perforce::Internal - - No executable specified - Nebyl zadán žádný spustitelný soubor - - - Unable to launch "%1": %2 - "%1" se nepodařilo spustit: %2 - - - "%1" timed out after %2ms. - Překročení času při provedení "%1"(%2ms). - - - "%1" crashed. - "%1" spadl. - - - "%1" terminated with exit code %2: %3 - Proces '%1" byl ukončen (vrácená hodnota %2): %3 - - - The client does not seem to contain any mapped files. - 'Perforce' klient zřejmě neobsahuje žádná přiřazení souborů. - - - - Perforce::Internal::ChangeNumberDialog + ::Perforce Change Number Číslo změny @@ -8754,9 +8727,6 @@ ve svém .pro souboru. Change Number: Číslo změny: - - - Perforce::Internal::PendingChangesDialog P4 Pending Changes P4 nevyřízené změny @@ -8773,9 +8743,6 @@ ve svém .pro souboru. Change %1: %2 Změna %1: %2 - - - Perforce::Internal::PerforcePlugin &Perforce &Perforce @@ -8928,10 +8895,6 @@ ve svém .pro souboru. Update All Aktualizovat vše - - Submit - Odevzdat (submit) - Diff Selected Files Diff pro vybrané soubory @@ -9168,16 +9131,10 @@ ve svém .pro souboru. Error running "where" on %1: The file is not mapped Chyba při provedení "where" na %1: Soubor není přiřazen - - - Perforce::Internal::PerforceSubmitEditor Perforce Submit Odevzdání 'Perforce' (submit) - - - Perforce::Internal::PromptDialog Perforce Prompt Výzva 'Perforce' @@ -9186,9 +9143,6 @@ ve svém .pro souboru. OK OK - - - Perforce::Internal::SettingsPage P4 Command: Příkaz P4: @@ -9273,9 +9227,6 @@ ve svém .pro souboru. Automatically open files when editing Soubory při úpravách otevřít automaticky - - - Perforce::Internal::SettingsPageWidget Testing... Běží zkouška... @@ -9292,13 +9243,6 @@ ve svém .pro souboru. Perforce Command Příkaz Perforce - - - Perforce::Internal::SubmitPanel - - Submit - Odevzdat (submit) - Change: Změna: @@ -23737,7 +23681,7 @@ Proces Pdb po určité době od úspěšného spuštění spadl. - Perforce::Internal::PerforceChecker + ::Perforce No executable specified Nebyl zadán žádný spustitelný soubor @@ -23771,9 +23715,6 @@ Proces Pdb po určité době od úspěšného spuštění spadl. The repository "%1" does not exist. Skladiště "%1" neexistuje. - - - Perforce::Internal::PerforceEditor Annotate change list "%1" Opatřit anotacemi seznam se změnami "%1" @@ -33372,7 +33313,7 @@ když bude zavolán mimo git bash. - Perforce::Internal::PerforceDiffParameterWidget + ::Perforce Ignore whitespace Nevšímat si bílých znaků @@ -48731,7 +48672,7 @@ Zasáhnutí do modulu nebo nastavení bodů přerušení podle souboru, a oček - Perforce::Internal::PerforceVersionControl + ::Perforce &Edit (%1) &Upravit (%1) diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index cb02b4d5472..35f60b94932 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -20669,7 +20669,7 @@ Fejl: %5 - Perforce::Internal::ChangeNumberDialog + ::Perforce Change Number Skift nummer @@ -20678,9 +20678,6 @@ Fejl: %5 Change Number: Skift nummer: - - - Perforce::Internal::PendingChangesDialog P4 Pending Changes P4 afventende ændringer @@ -20697,9 +20694,6 @@ Fejl: %5 Change %1: %2 Skift %1: %2 - - - Perforce::Internal::PerforceChecker No executable specified Ingen eksekverbar angivet @@ -20733,23 +20727,14 @@ Fejl: %5 The repository "%1" does not exist. Repository'et "%1" findes ikke. - - - Perforce::Internal::PerforceDiffConfig Ignore Whitespace Ignorer blanktegn - - - Perforce::Internal::PerforceEditorWidget Annotate change list "%1" Annotate ændringslisten "%1" - - - Perforce::Internal::PerforcePlugin &Perforce &Perforce @@ -20962,10 +20947,6 @@ Fejl: %5 Filelog... Filelog... - - Submit - Indsend - Diff &Selected Files Diff &valgte filer @@ -21104,16 +21085,10 @@ Fejl: %5 Perforce: Unable to determine the repository: %1 Perforce: Kunne ikke beslutte repository'et: %1 - - - Perforce::Internal::PerforceSubmitEditor Perforce Submit Perforce submit - - - Perforce::Internal::PerforceVersionControl &Edit &Rediger @@ -21122,9 +21097,6 @@ Fejl: %5 &Hijack &Hijack - - - Perforce::Internal::PromptDialog Perforce Prompt Perforce-prompt @@ -21133,9 +21105,6 @@ Fejl: %5 OK OK - - - Perforce::Internal::SettingsPage Configuration Konfiguration @@ -21192,9 +21161,6 @@ Fejl: %5 Perforce Perforce - - - Perforce::Internal::SettingsPageWidget Perforce Command Perforce-kommando @@ -21207,13 +21173,6 @@ Fejl: %5 Test succeeded (%1). Test lykkedes (%1). - - - Perforce::Internal::SubmitPanel - - Submit - Indsend - Change: Ændring: diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index a41114908c1..45c68fc0659 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -9576,7 +9576,7 @@ Leer lassen, um das Dateisystem zu durchsuchen. - Perforce::Internal::ChangeNumberDialog + ::Perforce Change Number Change-Nummer @@ -9585,9 +9585,6 @@ Leer lassen, um das Dateisystem zu durchsuchen. Change Number: Change-Nummer: - - - Perforce::Internal::PendingChangesDialog P4 Pending Changes P4 Ausstehende Changes @@ -9604,9 +9601,6 @@ Leer lassen, um das Dateisystem zu durchsuchen. Change %1: %2 Change %1: %2 - - - Perforce::Internal::PerforcePlugin &Perforce &Perforce @@ -9831,10 +9825,6 @@ Leer lassen, um das Dateisystem zu durchsuchen. &Hijack &Hijack - - Submit - Submit - p4 revert Rückgängig machen @@ -9940,16 +9930,10 @@ Leer lassen, um das Dateisystem zu durchsuchen. Could not submit the change, because your workspace was out of date. Created a pending submit instead. Der Submit-Vorgang konnte nicht ausgeführt werden, weil Ihr Arbeitsbereich nicht auf dem aktuellsten Stand ist. Es wurde ein ausstehender Submit-Vorgang erzeugt. - - - Perforce::Internal::PerforceSubmitEditor Perforce Submit Perforce Submit - - - Perforce::Internal::SettingsPage Perforce Command Perforce-Kommando @@ -10018,13 +10002,6 @@ Leer lassen, um das Dateisystem zu durchsuchen. Automatically open files when editing Dateien bei Bearbeitung automatisch anfordern - - - Perforce::Internal::SubmitPanel - - Submit - Submit - Change: Änderung: @@ -13386,7 +13363,7 @@ Was möchten Sie tun? - Perforce::Internal::PerforceChecker + ::Perforce No executable specified Es wurde keine ausführbare Datei angegeben @@ -33927,7 +33904,7 @@ Benutzen Sie dies nur für Prototypen. Sie können damit keine vollständige Anw - Perforce::Internal::PerforceEditorWidget + ::Perforce Annotate change list "%1" Annotation der Change-Liste "%1" @@ -39930,7 +39907,7 @@ Ablaufdatum: %3 - Perforce::Internal::PerforceDiffConfig + ::Perforce Ignore Whitespace Leerzeichen ignorieren diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts index ae4f4d49e93..c5476797aff 100644 --- a/share/qtcreator/translations/qtcreator_es.ts +++ b/share/qtcreator/translations/qtcreator_es.ts @@ -6119,7 +6119,7 @@ en su archivo .pro. - Perforce::Internal + ::Perforce No executable specified No se especificó ejecutable @@ -6144,9 +6144,6 @@ en su archivo .pro. The client does not seem to contain any mapped files. El cliente no parece contener ningún archivo mapeado. - - - Perforce::Internal::ChangeNumberDialog Change Number Modificar número @@ -6156,9 +6153,6 @@ en su archivo .pro. Change Number: Modificar número: - - - Perforce::Internal::PendingChangesDialog P4 Pending Changes Modificaciones pendientes de P4 @@ -6177,9 +6171,6 @@ en su archivo .pro. Change %1: %2 Modificar %1: %2 - - - Perforce::Internal::PerforceOutputWindow Perforce Output Salida de Perforce @@ -6188,9 +6179,6 @@ en su archivo .pro. Diff Diferencias - - - Perforce::Internal::PerforcePlugin &Perforce &Perforce @@ -6473,16 +6461,10 @@ en su archivo .pro. Error running "where" on %1: The file is not mapped Error ejecutando "where" en %1: El archivo no esta mapeado - - - Perforce::Internal::PerforceSubmitEditor Perforce Submit Envío a Perforce - - - Perforce::Internal::PromptDialog Perforce Prompt Interacción con Perforce @@ -6492,9 +6474,6 @@ en su archivo .pro. OK Ok - - - Perforce::Internal::SettingsPage P4 Command: Comando P4: @@ -6537,9 +6516,6 @@ en su archivo .pro. Prompt to submit Preguntar antes de enviar - - - Perforce::Internal::SettingsPageWidget Testing... Probando... @@ -6552,13 +6528,6 @@ en su archivo .pro. Perforce Command Comando Perforce - - - Perforce::Internal::SubmitPanel - - Submit - Enviar - Change: diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 8e5fa0d9cdd..766ba0df217 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -9337,34 +9337,7 @@ dans votre fichier .pro. - Perforce::Internal - - No executable specified - Aucun exécutable spécifié - - - Unable to launch "%1": %2 - Impossible de lancer "%1" : %2 - - - "%1" timed out after %2ms. - "%1" arrivé à échéance après %2ms. - - - "%1" crashed. - "%1" a crashé. - - - "%1" terminated with exit code %2: %3 - "%1" terminé avec le code %2 : %3 - - - The client does not seem to contain any mapped files. - Le client ne semble contenir aucun fichier correspondant. - - - - Perforce::Internal::ChangeNumberDialog + ::Perforce Change Number ? @@ -9375,9 +9348,6 @@ dans votre fichier .pro. ? Numéro du changement : - - - Perforce::Internal::PendingChangesDialog P4 Pending Changes Modifications pour P4 en attente @@ -9394,9 +9364,6 @@ dans votre fichier .pro. Change %1: %2 Modification %1 : %2 - - - Perforce::Internal::PerforcePlugin &Perforce &Perforce @@ -9621,10 +9588,6 @@ dans votre fichier .pro. Repository Log Log du dépôt - - Submit - Envoyer - Diff Selected Files Faire un diff sur tous les fichiers sélectionnés @@ -9792,16 +9755,10 @@ francis : voila une nouvelle suggestion :) Error running "where" on %1: The file is not mapped Erreur d'exécution de "where" sur %1 : le fichier n'est pas mappé - - - Perforce::Internal::PerforceSubmitEditor Perforce Submit Perforce Submit - - - Perforce::Internal::PromptDialog Perforce Prompt Prompt Perforce @@ -9810,9 +9767,6 @@ francis : voila une nouvelle suggestion :) OK OK - - - Perforce::Internal::SettingsPage Prompt to submit Invite lors du submit @@ -9897,9 +9851,6 @@ francis : voila une nouvelle suggestion :) Automatically open files when editing Ouvrir automatiquement les fichiers lors de l'édition - - - Perforce::Internal::SettingsPageWidget Perforce Command Commande Perforce @@ -9916,13 +9867,6 @@ francis : voila une nouvelle suggestion :) Test succeeded. Test réussi. - - - Perforce::Internal::SubmitPanel - - Submit - Envoyer - Change: Modification : @@ -22963,7 +22907,7 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. - Perforce::Internal::PerforceChecker + ::Perforce No executable specified Aucun exécutable spécifié @@ -22997,9 +22941,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus. The repository "%1" does not exist. Le dépôt "%1" n'existe pas. - - - Perforce::Internal::PerforceEditor Annotate change list "%1" Annoter la liste des changements "%1" @@ -35774,7 +35715,7 @@ These files are preserved. - Perforce::Internal::PerforceDiffParameterWidget + ::Perforce Ignore whitespace Ignorer l'espace blanc @@ -46198,7 +46139,7 @@ were not verified among remotes in %3. Select different folder? - Perforce::Internal::PerforceVersionControl + ::Perforce &Edit (%1) &Éditer (%1) diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index cb99e94ab9e..271aabf3e10 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -4980,7 +4980,7 @@ Greška: %5 - Perforce::Internal::ChangeNumberDialog + ::Perforce Change Number Promijeni broj @@ -4989,9 +4989,6 @@ Greška: %5 Change Number: Promijeni broj: - - - Perforce::Internal::PendingChangesDialog P4 Pending Changes P4 neobavljene promjene @@ -5008,9 +5005,6 @@ Greška: %5 Change %1: %2 Promijeni %1: %2 - - - Perforce::Internal::PromptDialog Perforce Prompt Perforce prompt @@ -5019,9 +5013,6 @@ Greška: %5 OK U redu - - - Perforce::Internal::SettingsPage Configuration Konfiguracija @@ -5078,13 +5069,6 @@ Greška: %5 Perforce Perforce - - - Perforce::Internal::SubmitPanel - - Submit - Pošalji - Change: Promijeni: @@ -26193,7 +26177,7 @@ Rok upotrebe: %3 - Perforce::Internal::PerforceChecker + ::Perforce No executable specified Izvršna datoteka nije specificirana @@ -26227,16 +26211,10 @@ Rok upotrebe: %3 The repository "%1" does not exist. Spremište "%1" ne postoji. - - - Perforce::Internal::PerforceEditorWidget Annotate change list "%1" Pribilježi popis promjena "%1" - - - Perforce::Internal::PerforcePlugin &Perforce &Perforce @@ -26521,10 +26499,6 @@ Rok upotrebe: %3 - - Submit - Pošalji - p4 diff %1 @@ -26563,23 +26537,14 @@ Rok upotrebe: %3 Perforce: Unable to determine the repository: %1 Perforce: Nije moguće odrediti spremište: %1 - - - Perforce::Internal::PerforceDiffConfig Ignore Whitespace Zanemari bjeline - - - Perforce::Internal::PerforceSubmitEditor Perforce Submit Perforce slanje - - - Perforce::Internal::PerforceVersionControl &Edit &Uredi @@ -26588,9 +26553,6 @@ Rok upotrebe: %3 &Hijack - - - Perforce::Internal::SettingsPageWidget Perforce Command Perforce naredba diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts index d6f431ef1f2..e7c65847017 100644 --- a/share/qtcreator/translations/qtcreator_hu.ts +++ b/share/qtcreator/translations/qtcreator_hu.ts @@ -9243,7 +9243,7 @@ p, li { white-space: pre-wrap; } - Perforce::0 + ::Perforce No executable specified Nincs futtatható meghatározva @@ -9268,9 +9268,6 @@ p, li { white-space: pre-wrap; } The client does not seem to contain any mapped files. Nem tűnik úgy, hogy a Perforce kliens tartalmazna leképezett fájlokat. - - - Perforce::Internal No executable specified Nincs futtatható meghatározva @@ -9295,9 +9292,6 @@ p, li { white-space: pre-wrap; } The client does not seem to contain any mapped files. Nem tűnik úgy, hogy a Perforce kliens tartalmazna leképezett fájlokat. - - - Perforce::Internal::0 Change Number Változtatási szám @@ -9672,9 +9666,6 @@ p, li { white-space: pre-wrap; } User: Felhasználó: - - - Perforce::Internal::ChangeNumberDialog Change Number Változtatási szám @@ -9683,9 +9674,6 @@ p, li { white-space: pre-wrap; } Change Number: Változtatási szám: - - - Perforce::Internal::PendingChangesDialog P4 Pending Changes Függőben levő P4 változtatások @@ -9702,9 +9690,6 @@ p, li { white-space: pre-wrap; } Change %1: %2 %1 változtatása: %2 - - - Perforce::Internal::PerforcePlugin &Perforce &Perforce @@ -9857,10 +9842,6 @@ p, li { white-space: pre-wrap; } Update All Az összes frissítése - - Submit - Feltöltés - Diff Selected Files Különbség a kiválasztott fájlokban @@ -9982,16 +9963,10 @@ p, li { white-space: pre-wrap; } Error running "where" on %1: The file is not mapped Hiba történt a(z) %1 futtatása közben: a fájl nincsen leképezve - - - Perforce::Internal::PerforceSubmitEditor Perforce Submit Perforce feltöltés - - - Perforce::Internal::PromptDialog Perforce Prompt Perforce prompt @@ -10000,9 +9975,6 @@ p, li { white-space: pre-wrap; } OK OK - - - Perforce::Internal::SettingsPage Prompt to submit Feltöltési prompt @@ -10039,9 +10011,6 @@ p, li { white-space: pre-wrap; } Perforce Perforce - - - Perforce::Internal::SettingsPageWidget Perforce Command Perforce parancs @@ -10054,13 +10023,6 @@ p, li { white-space: pre-wrap; } Test succeeded. Sikeres teszt. - - - Perforce::Internal::SubmitPanel - - Submit - Feltöltés - Change: Változás: diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts index 7cdb823813f..76c21446b10 100644 --- a/share/qtcreator/translations/qtcreator_it.ts +++ b/share/qtcreator/translations/qtcreator_it.ts @@ -6015,7 +6015,7 @@ nel tuo file .pro. - Perforce::Internal + ::Perforce No executable specified Non è stato impostato alcun eseguibile @@ -6040,9 +6040,6 @@ nel tuo file .pro. The client does not seem to contain any mapped files. Il client non sembra contenere alcun file mappato. - - - Perforce::Internal::ChangeNumberDialog Change Number Numero della Modifica @@ -6052,9 +6049,6 @@ nel tuo file .pro. Change Number: Numero della Modifica: - - - Perforce::Internal::PendingChangesDialog P4 Pending Changes P4 Modifiche in Sospeso @@ -6073,9 +6067,6 @@ nel tuo file .pro. Change %1: %2 Modifica %1: %2 - - - Perforce::Internal::PerforceOutputWindow Perforce Output Output di Perforce @@ -6088,9 +6079,6 @@ nel tuo file .pro. Perforce Perforce - - - Perforce::Internal::PerforcePlugin &Perforce &Perforce @@ -6374,16 +6362,10 @@ nel tuo file .pro. Error running "where" on %1: The file is not mapped Errore in esecuzione di "where" su %1. Il file non è mappato - - - Perforce::Internal::PerforceSubmitEditor Perforce Submit Invio Perforce - - - Perforce::Internal::PromptDialog Perforce Prompt Richiesta Perforce @@ -6393,9 +6375,6 @@ nel tuo file .pro. OK OK - - - Perforce::Internal::SettingsPage P4 Command: Comando P4: @@ -6438,9 +6417,6 @@ nel tuo file .pro. Prompt to submit Prompt del submit - - - Perforce::Internal::SettingsPageWidget Testing... Test... @@ -6453,13 +6429,6 @@ nel tuo file .pro. Perforce Command Comando Perforce - - - Perforce::Internal::SubmitPanel - - Submit - Invio - Change: diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 75c96739204..c9fb647fab7 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -3898,7 +3898,7 @@ Add, modify, and remove document filters, which determine the documentation set - Perforce::Internal::ChangeNumberDialog + ::Perforce Change Number リビジョン番号 @@ -3907,9 +3907,6 @@ Add, modify, and remove document filters, which determine the documentation set Change Number: リビジョン番号: - - - Perforce::Internal::PendingChangesDialog P4 Pending Changes P4 保留中の変更点 @@ -3926,9 +3923,6 @@ Add, modify, and remove document filters, which determine the documentation set Change %1: %2 変更 %1: %2 - - - Perforce::Internal::PromptDialog Perforce Prompt Perforce プロンプト @@ -3937,9 +3931,6 @@ Add, modify, and remove document filters, which determine the documentation set OK OK - - - Perforce::Internal::SettingsPage Configuration 設定 @@ -3996,10 +3987,6 @@ Add, modify, and remove document filters, which determine the documentation set Perforce Command Perforce コマンド - - Testing... - 自動テスト... - Test succeeded (%1). テストが成功しました (%1)。 @@ -4008,13 +3995,6 @@ Add, modify, and remove document filters, which determine the documentation set Perforce Perforce - - - Perforce::Internal::SubmitPanel - - Submit - サブミット - Change: リビジョン: @@ -21953,7 +21933,7 @@ instead of its installation directory when run outside git bash. - Perforce::Internal::PerforceChecker + ::Perforce No executable specified 実行ファイルが指定されていません @@ -21987,9 +21967,6 @@ instead of its installation directory when run outside git bash. The repository "%1" does not exist. リポジトリ "%1" は存在しません。 - - - Perforce::Internal::PerforcePlugin &Perforce &Perforce @@ -22210,10 +22187,6 @@ instead of its installation directory when run outside git bash. &Hijack ハイジャック(&H) - - Submit - サブミット - Diff &Selected Files 選択済みファイルの差分表示(&S) @@ -22346,46 +22319,18 @@ instead of its installation directory when run outside git bash. Perforce: Unable to determine the repository: %1 Perforce がリポジトリを特定できません: %1 - - - Perforce::Internal::PerforceDiffParameterWidget Ignore Whitespace 空白を無視 - - - Perforce::Internal::PerforceSubmitEditor Perforce Submit Perforce コミット - - - Perforce::Internal::PerforceVersionControl - - &Edit - 編集(&E) - - - &Hijack - ハイジャック(&H) - - - - Perforce::Internal::SettingsPageWidget - - Perforce Command - Perforce コマンド - Testing... テスト中... - - Test succeeded (%1). - テストが成功しました (%1)。 - ::ProjectExplorer @@ -40254,7 +40199,7 @@ Would you like to overwrite it? - Perforce::Internal::PerforceEditorWidget + ::Perforce Annotate change list "%1" チェンジリスト "%1" のアノテーション @@ -47000,11 +46945,7 @@ Stepping into the module or setting breakpoints by file and line is expected to - Perforce::Internal::PerforceDiffConfig - - Ignore Whitespace - 空白を無視 - + ::Perforce ::PerfProfiler diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 4f141d44f65..8904864b113 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -630,7 +630,7 @@ - Perforce::Internal::ChangeNumberDialog + ::Perforce Change Number Numer zmiany @@ -639,9 +639,6 @@ Change Number: Numer zmiany: - - - Perforce::Internal::PendingChangesDialog P4 Pending Changes Oczekujące zmiany P4 @@ -658,9 +655,6 @@ Change %1: %2 Zmiana %1: %2 - - - Perforce::Internal::PromptDialog Perforce Prompt Pytanie Perforce'a @@ -669,9 +663,6 @@ OK OK - - - Perforce::Internal::SettingsPage Test Przetestuj @@ -728,13 +719,6 @@ Automatically open files when editing Automatycznie otwieraj pliki, jeśli zostały zmodyfikowane - - - Perforce::Internal::SubmitPanel - - Submit - Utwórz poprawkę - Change: Zmiana: @@ -6643,7 +6627,7 @@ Dodaj, zmodyfikuj lub usuń filtry dokumentów, które determinują zestaw dokum - Perforce::Internal::PerforcePlugin + ::Perforce &Perforce &Perforce @@ -6856,10 +6840,6 @@ Dodaj, zmodyfikuj lub usuń filtry dokumentów, które determinują zestaw dokum Repository Log Log repozytorium - - Submit - Utwórz poprawkę - &Undo &Cofnij @@ -6995,16 +6975,10 @@ Dodaj, zmodyfikuj lub usuń filtry dokumentów, które determinują zestaw dokum Could not submit the change, because your workspace was out of date. Created a pending submit instead. Nie można utworzyć poprawki, ponieważ drzewo robocze nie jest aktualne. Zamiast tego utworzono poprawkę oczekującą na wysłanie. - - - Perforce::Internal::PerforceSubmitEditor Perforce Submit Utwórz poprawkę w Perforce - - - Perforce::Internal::SettingsPageWidget Perforce Command Komenda Perforce @@ -11069,7 +11043,7 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM - Perforce::Internal::PerforceChecker + ::Perforce No executable specified Nie podano programu do uruchomienia @@ -22623,7 +22597,7 @@ You can choose another communication channel here, such as a serial line or cust - Perforce::Internal::PerforceVersionControl + ::Perforce &Edit &Edycja @@ -31152,7 +31126,7 @@ Use this only if you are prototyping. You cannot create a full application with - Perforce::Internal::PerforceEditorWidget + ::Perforce Annotate change list "%1" Dołącz adnotację do listy zmian "%1" @@ -40043,7 +40017,7 @@ Termin wygaśnięcia: %3 - Perforce::Internal::PerforceDiffConfig + ::Perforce Ignore Whitespace Ignoruj białe znaki diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index d4fce36eeb2..a258f3a6f89 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -27162,7 +27162,7 @@ You might find further explanations in the Application Output view. - Perforce::Internal::ChangeNumberDialog + ::Perforce Change Number Номер правки @@ -27171,9 +27171,6 @@ You might find further explanations in the Application Output view. Change Number: Номер правки: - - - Perforce::Internal::PendingChangesDialog P4 Pending Changes Perforce: Рассмотрение изменений @@ -27190,9 +27187,6 @@ You might find further explanations in the Application Output view. Change %1: %2 Изменение %1: %2 - - - Perforce::Internal::PerforceChecker No executable specified Программа не указана @@ -27226,23 +27220,14 @@ You might find further explanations in the Application Output view. The repository "%1" does not exist. Хранилище «%1» отсутствует. - - - Perforce::Internal::PerforceDiffConfig Ignore Whitespace Игнорировать пробелы - - - Perforce::Internal::PerforceEditorWidget Annotate change list "%1" Аннотация списка изменений «%1» - - - Perforce::Internal::PerforcePlugin &Perforce &Perforce @@ -27463,10 +27448,6 @@ You might find further explanations in the Application Output view. &Hijack &Исправить - - Submit - Фиксировать - p4 revert p4 revert @@ -27577,16 +27558,10 @@ You might find further explanations in the Application Output view. Could not submit the change, because your workspace was out of date. Created a pending submit instead. Не удалось зафиксировать изменения, так как рабочая копия устарела. Создана фиксация для рассмотрения. - - - Perforce::Internal::PerforceSubmitEditor Perforce Submit Фиксация Perforce - - - Perforce::Internal::PromptDialog Perforce Prompt Perforce: приглашение @@ -27595,9 +27570,6 @@ You might find further explanations in the Application Output view. OK Закрыть - - - Perforce::Internal::SettingsPage Test Проверить @@ -27666,13 +27638,6 @@ You might find further explanations in the Application Output view. Automatically open files when editing Автоматически открывать файлы при изменении - - - Perforce::Internal::SubmitPanel - - Submit - Фиксировать - Change: Правка: diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index d82b6a05524..d2906e10a86 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -6337,7 +6337,7 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr - Perforce::Internal::ChangeNumberDialog + ::Perforce Change Number Številka spremembe @@ -6347,18 +6347,10 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Change Number: Številka spremembe: - - - Perforce::Internal::PendingChangesDialog P4 Pending Changes Čakajoče spremembe P4 - - - Submit - Pošlji - Cancel @@ -6368,9 +6360,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Change %1: %2 Sprememba %1: %2 - - - Perforce::Internal::PerforcePlugin &Perforce &Perforce @@ -6511,10 +6500,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Update All Posodobi vse - - Submit - Pošlji - &Undo &Razveljavi @@ -6705,16 +6690,10 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Cannot open temporary file. Ni moč odpreti začasne datoteke. - - - Perforce::Internal::PerforceSubmitEditor Perforce Submit Pošiljanje Perforce - - - Perforce::Internal::PromptDialog Perforce Prompt Poziv Perforce @@ -6724,9 +6703,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr OK V redu - - - Perforce::Internal::SettingsPage Perforce Perforce @@ -6795,9 +6771,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Automatically open files when editing Med urejanjem samodejno odpiraj datoteke - - - Perforce::Internal::SettingsPageWidget Testing... Preizkušanje … @@ -6810,9 +6783,6 @@ enojen »Vstopi« za oddajo signala pa vas bo privedel neposredno do ustrezne pr Perforce Command Ukaz Perforce - - - Perforce::Internal::SubmitPanel Submit Pošiljanje @@ -15756,7 +15726,7 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 - Perforce::Internal::PerforceChecker + ::Perforce No executable specified Določen ni noben program. @@ -15791,9 +15761,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4 The repository "%1" does not exist. Skladišče »%1« ne obstaja. - - - Perforce::Internal::PerforceEditor Annotate change list "%1" Dodaj opombo za seznam sprememb »%1« @@ -23866,7 +23833,7 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen. - Perforce::Internal::PerforceDiffParameterWidget + ::Perforce Ignore whitespace Prezri presledke diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index f872799a7d2..e3c55c90185 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -11916,7 +11916,7 @@ Ids must begin with a lowercase letter. - Perforce::Internal::ChangeNumberDialog + ::Perforce Change Number @@ -11925,9 +11925,6 @@ Ids must begin with a lowercase letter. Change Number: - - - Perforce::Internal::PendingChangesDialog P4 Pending Changes @@ -11944,9 +11941,6 @@ Ids must begin with a lowercase letter. Change %1: %2 - - - Perforce::Internal::PerforceChecker No executable specified Виконуваний модуль не вказано @@ -11984,9 +11978,6 @@ Ids must begin with a lowercase letter. The repository "%1" does not exist. Сховище "%1" не існує. - - - Perforce::Internal::PerforceDiffParameterWidget Ignore whitespace Ігнорувати пропуски @@ -11995,9 +11986,6 @@ Ids must begin with a lowercase letter. Ignore Whitespace Ігнорувати пропуски - - - Perforce::Internal::PerforcePlugin &Perforce @@ -12210,10 +12198,6 @@ Ids must begin with a lowercase letter. Filelog... - - Submit - - Diff &Selected Files &Зміни у вибраних файлах @@ -12356,16 +12340,10 @@ Ids must begin with a lowercase letter. Perforce: Unable to determine the repository: %1 Perforce: Неможливо визначити сховище: %1 - - - Perforce::Internal::PerforceSubmitEditor Perforce Submit - - - Perforce::Internal::PromptDialog Perforce Prompt @@ -12374,9 +12352,6 @@ Ids must begin with a lowercase letter. OK OK - - - Perforce::Internal::SettingsPage Configuration Конфігурація @@ -12433,9 +12408,6 @@ Ids must begin with a lowercase letter. Automatically open files when editing Автоматично відкривати файли під час редагування - - - Perforce::Internal::SettingsPageWidget Perforce Command Команда Perforce @@ -12448,13 +12420,6 @@ Ids must begin with a lowercase letter. Test succeeded (%1). Перевірка успішна (%1). - - - Perforce::Internal::SubmitPanel - - Submit - - Change: Зміна: @@ -28891,7 +28856,7 @@ Do you want to add them to the project?</html> - Perforce::Internal::PerforceVersionControl + ::Perforce &Edit @@ -41456,7 +41421,7 @@ Preselects a desktop Qt for building the application if available. - Perforce::Internal::PerforceEditorWidget + ::Perforce Annotate change list "%1" diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index 92bf199b56b..d3155d258a9 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -26543,7 +26543,7 @@ You might find further explanations in the Application Output view. - Perforce::Internal::ChangeNumberDialog + ::Perforce Change Number Change编号 @@ -26552,9 +26552,6 @@ You might find further explanations in the Application Output view. Change Number: Change编号: - - - Perforce::Internal::PendingChangesDialog P4 Pending Changes P4未完成的Change @@ -26571,9 +26568,6 @@ You might find further explanations in the Application Output view. Change %1: %2 Change %1: %2 - - - Perforce::Internal::PerforceChecker No executable specified 未指定执行档 @@ -26607,23 +26601,14 @@ You might find further explanations in the Application Output view. "%1" timed out after %2 ms. - - - Perforce::Internal::PerforceDiffConfig Ignore Whitespace 忽略空白 - - - Perforce::Internal::PerforceEditorWidget Annotate change list "%1" 注释变更列表 "%1" - - - Perforce::Internal::PerforcePlugin &Perforce &Perforce @@ -26804,10 +26789,6 @@ You might find further explanations in the Application Output view. Repository Log 仓库日志 - - Submit - 提交 - p4 revert p4 还原(revert) @@ -26956,16 +26937,10 @@ You might find further explanations in the Application Output view. - - - Perforce::Internal::PerforceSubmitEditor Perforce Submit Perforce提交 - - - Perforce::Internal::SettingsPage Perforce Perforce @@ -27034,13 +27009,6 @@ You might find further explanations in the Application Output view. Testing... 测试中... - - - Perforce::Internal::SubmitPanel - - Submit - 提交 - Change: 更改: diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index e65fa96d48a..7776613d925 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -5874,7 +5874,7 @@ Add, modify, and remove document filters, which determine the documentation set - Perforce::Internal::ChangeNumberDialog + ::Perforce Change Number 變更數值 @@ -5883,9 +5883,6 @@ Add, modify, and remove document filters, which determine the documentation set Change Number: 變更數值： - - - Perforce::Internal::PendingChangesDialog P4 Pending Changes P4 未完成的變更 @@ -5902,9 +5899,6 @@ Add, modify, and remove document filters, which determine the documentation set Change %1: %2 變更 %1：%2 - - - Perforce::Internal::PerforcePlugin &Perforce Perforce(&P) @@ -6113,10 +6107,6 @@ Add, modify, and remove document filters, which determine the documentation set Repository Log 主目錄紀錄 - - Submit - 提交 - &Undo 復原(&U) @@ -6245,16 +6235,10 @@ Add, modify, and remove document filters, which determine the documentation set Could not submit the change, because your workspace was out of date. Created a pending submit instead. 無法提交變更，因為您的工作空間已經過時。已幫您建立了一個「未完成的提交」。 - - - Perforce::Internal::PerforceSubmitEditor Perforce Submit Perforce 提交 - - - Perforce::Internal::PromptDialog Perforce Prompt Perforce 提示 @@ -6263,9 +6247,6 @@ Add, modify, and remove document filters, which determine the documentation set OK 確定 - - - Perforce::Internal::SettingsPage Perforce Perforce @@ -6322,9 +6303,6 @@ Add, modify, and remove document filters, which determine the documentation set Automatically open files when editing 編輯時自動開啟檔案 - - - Perforce::Internal::SettingsPageWidget Testing... 測試中... @@ -6337,13 +6315,6 @@ Add, modify, and remove document filters, which determine the documentation set Perforce Command Perforce 指令 - - - Perforce::Internal::SubmitPanel - - Submit - 提交 - Change: 變更： @@ -11898,7 +11869,7 @@ Reason: %2 - Perforce::Internal::PerforceChecker + ::Perforce No executable specified 未指定執行檔 @@ -12799,7 +12770,7 @@ For qmlproject projects, use the importPaths property to add import paths. - Perforce::Internal::PerforceEditor + ::Perforce Annotate change list "%1" 註記變更列表 "%1" @@ -21610,7 +21581,7 @@ These files are preserved. - Perforce::Internal::PerforceDiffParameterWidget + ::Perforce Ignore whitespace 忽略空白 @@ -30999,7 +30970,7 @@ Do you want to add them to the project?</html> - Perforce::Internal::PerforceVersionControl + ::Perforce &Edit (%1) diff --git a/src/plugins/perforce/annotationhighlighter.cpp b/src/plugins/perforce/annotationhighlighter.cpp index 0490c20c63e..42872b98192 100644 --- a/src/plugins/perforce/annotationhighlighter.cpp +++ b/src/plugins/perforce/annotationhighlighter.cpp @@ -3,8 +3,7 @@ #include "annotationhighlighter.h" -namespace Perforce { -namespace Internal { +namespace Perforce::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 +} // Perforce::Internal diff --git a/src/plugins/perforce/annotationhighlighter.h b/src/plugins/perforce/annotationhighlighter.h index afcc6ce22b0..9c3066d3d2d 100644 --- a/src/plugins/perforce/annotationhighlighter.h +++ b/src/plugins/perforce/annotationhighlighter.h @@ -5,8 +5,7 @@ #include -namespace Perforce { -namespace Internal { +namespace Perforce::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 -} // namespace Internal +} // Perforce::Internal diff --git a/src/plugins/perforce/changenumberdialog.cpp b/src/plugins/perforce/changenumberdialog.cpp index 3ceab22e61e..b5a0aa27870 100644 --- a/src/plugins/perforce/changenumberdialog.cpp +++ b/src/plugins/perforce/changenumberdialog.cpp @@ -3,19 +3,21 @@ #include "changenumberdialog.h" +#include "perforcetr.h" + #include #include #include #include -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 diff --git a/src/plugins/perforce/changenumberdialog.h b/src/plugins/perforce/changenumberdialog.h index b7f27943fbb..eae2a9447b0 100644 --- a/src/plugins/perforce/changenumberdialog.h +++ b/src/plugins/perforce/changenumberdialog.h @@ -9,8 +9,7 @@ QT_BEGIN_NAMESPACE class QLineEdit; QT_END_NAMESPACE -namespace Perforce { -namespace Internal { +namespace Perforce::Internal { // Input a change number for pending changes. class ChangeNumberDialog : public QDialog @@ -24,5 +23,4 @@ private: QLineEdit *m_lineEdit = nullptr; }; -} // namespace Perforce -} // namespace Internal +} // Perforce::Internal diff --git a/src/plugins/perforce/pendingchangesdialog.cpp b/src/plugins/perforce/pendingchangesdialog.cpp index 3fea0786a03..589d17b276e 100644 --- a/src/plugins/perforce/pendingchangesdialog.cpp +++ b/src/plugins/perforce/pendingchangesdialog.cpp @@ -3,6 +3,8 @@ #include "pendingchangesdialog.h" +#include "perforcetr.h" + #include #include @@ -11,18 +13,18 @@ #include #include -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,8 +34,8 @@ 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), - match.captured(2).trimmed()), + 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 diff --git a/src/plugins/perforce/pendingchangesdialog.h b/src/plugins/perforce/pendingchangesdialog.h index 5d228eccf4d..8d96598ed5e 100644 --- a/src/plugins/perforce/pendingchangesdialog.h +++ b/src/plugins/perforce/pendingchangesdialog.h @@ -9,8 +9,7 @@ QT_BEGIN_NAMESPACE class QListWidget; QT_END_NAMESPACE -namespace Perforce { -namespace Internal { +namespace Perforce::Internal { class PendingChangesDialog : public QDialog { @@ -24,5 +23,4 @@ private: QListWidget *m_listWidget = nullptr; }; -} // namespace Perforce -} // namespace Internal +} // Perforce::Internal diff --git a/src/plugins/perforce/perforcechecker.cpp b/src/plugins/perforce/perforcechecker.cpp index 93ec5a932a3..fc2aeae3e1e 100644 --- a/src/plugins/perforce/perforcechecker.cpp +++ b/src/plugins/perforce/perforcechecker.cpp @@ -3,6 +3,8 @@ #include "perforcechecker.h" +#include "perforcetr.h" + #include #include @@ -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))); } } diff --git a/src/plugins/perforce/perforcechecker.h b/src/plugins/perforce/perforcechecker.h index e2b5f28a35f..e9325b4cedd 100644 --- a/src/plugins/perforce/perforcechecker.h +++ b/src/plugins/perforce/perforcechecker.h @@ -6,8 +6,7 @@ #include #include -namespace Perforce { -namespace Internal { +namespace Perforce::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 -} // namespace Perforce +} // Perforce::Internal diff --git a/src/plugins/perforce/perforceeditor.cpp b/src/plugins/perforce/perforceeditor.cpp index 4ef312bac33..2483f0dc522 100644 --- a/src/plugins/perforce/perforceeditor.cpp +++ b/src/plugins/perforce/perforceeditor.cpp @@ -5,25 +5,24 @@ #include "annotationhighlighter.h" #include "perforceplugin.h" +#include "perforcetr.h" #include #include #include +#include #include #include -#include -#include - -#include #include #include +#include +#include #include #include -#include +#include -namespace Perforce { -namespace Internal { +namespace Perforce::Internal { // ------------ PerforceEditor PerforceEditorWidget::PerforceEditorWidget() : @@ -37,7 +36,7 @@ PerforceEditorWidget::PerforceEditorWidget() : // +++ P:/XXX\closingkit\trunk\source\cui\src\cui_core.cpp2012-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 -} // namespace Perforce +} // Perforce::Internal diff --git a/src/plugins/perforce/perforceeditor.h b/src/plugins/perforce/perforceeditor.h index 251209a0b6e..ce0d05b6871 100644 --- a/src/plugins/perforce/perforceeditor.h +++ b/src/plugins/perforce/perforceeditor.h @@ -7,8 +7,7 @@ #include -namespace Perforce { -namespace Internal { +namespace Perforce::Internal { class PerforceEditorWidget : public VcsBase::VcsBaseEditorWidget { @@ -27,5 +26,4 @@ private: const QRegularExpression m_changeNumberPattern; }; -} // namespace Perforce -} // namespace Internal +} // Perforce::Internal diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index b581e4d816d..142b88b6744 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -9,6 +9,7 @@ #include "perforceeditor.h" #include "perforcesettings.h" #include "perforcesubmiteditor.h" +#include "perforcetr.h" #include #include @@ -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->setDescription(tr("Filelog Current File")); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+P,Meta+F") : Tr::tr("Alt+P,Alt+F"))); + 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->setDescription(tr("Edit File")); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+P,Meta+E") : Tr::tr("Alt+P,Alt+E"))); + 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->setDescription(tr("Add File")); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+P,Meta+A") : Tr::tr("Alt+P,Alt+A"))); + 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->setDescription(tr("Revert File")); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+P,Meta+R") : Tr::tr("Alt+P,Alt+R"))); + 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"); - m_diffProjectAction = new ParameterAction(diffProjectDefaultText, tr("Diff Project \"%1\""), ParameterAction::AlwaysEnabled, this); + const QString diffProjectDefaultText = Tr::tr("Diff Current Project/Session"); + 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"); - m_updateProjectAction = new ParameterAction(updateProjectDefaultText, tr("Update Project \"%1\""), ParameterAction::AlwaysEnabled, this); + const QString updateProjectDefaultText = Tr::tr("Update Current Project"); + 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"), - tr("The file has been changed. Do you want to revert it?"), + doNotRevert = (QMessageBox::warning(ICore::dialogParent(), Tr::tr("p4 revert"), + 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()); - if (QMessageBox::warning(ICore::dialogParent(), tr("p4 revert"), msg, QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) + 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::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) diff --git a/src/plugins/perforce/perforceplugin.h b/src/plugins/perforce/perforceplugin.h index a0d35f2606e..7dafbc7c93a 100644 --- a/src/plugins/perforce/perforceplugin.h +++ b/src/plugins/perforce/perforceplugin.h @@ -5,8 +5,7 @@ #include -namespace Perforce { -namespace Internal { +namespace Perforce::Internal { class PerforcePlugin final : public ExtensionSystem::IPlugin { @@ -30,5 +29,4 @@ private slots: #endif }; -} // namespace Perforce -} // namespace Internal +} // Perforce::Internal diff --git a/src/plugins/perforce/perforcesettings.cpp b/src/plugins/perforce/perforcesettings.cpp index 4440321c4bb..ac9d0b26b05 100644 --- a/src/plugins/perforce/perforcesettings.cpp +++ b/src/plugins/perforce/perforcesettings.cpp @@ -4,7 +4,7 @@ #include "perforcesettings.h" #include "perforcechecker.h" -#include "perforceplugin.h" +#include "perforcetr.h" #include #include @@ -22,8 +22,7 @@ using namespace Utils; -namespace Perforce { -namespace Internal { +namespace Perforce::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.setLabelText(tr("P4 command:")); + p4BinaryPath.setDisplayName(Tr::tr("Perforce 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.setSuffix(tr("s")); + timeOutS.setLabelText(Tr::tr("Timeout:")); + 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 +} // Perforce::Internal diff --git a/src/plugins/perforce/perforcesettings.h b/src/plugins/perforce/perforcesettings.h index fcad74f4c2e..f6c52957e6f 100644 --- a/src/plugins/perforce/perforcesettings.h +++ b/src/plugins/perforce/perforcesettings.h @@ -11,8 +11,7 @@ QT_BEGIN_NAMESPACE class QDir; QT_END_NAMESPACE -namespace Perforce { -namespace Internal { +namespace Perforce::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 -} // namespace Perforce +} // Perforce::Internal diff --git a/src/plugins/perforce/perforcesubmiteditor.cpp b/src/plugins/perforce/perforcesubmiteditor.cpp index 70e56058be7..9b6f8240d4c 100644 --- a/src/plugins/perforce/perforcesubmiteditor.cpp +++ b/src/plugins/perforce/perforcesubmiteditor.cpp @@ -3,7 +3,7 @@ #include "perforcesubmiteditor.h" #include "perforcesubmiteditorwidget.h" -#include "perforceplugin.h" +#include "perforcetr.h" #include #include @@ -11,8 +11,7 @@ #include -namespace Perforce { -namespace Internal { +namespace Perforce::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 +} // Perforce::Internal diff --git a/src/plugins/perforce/perforcesubmiteditor.h b/src/plugins/perforce/perforcesubmiteditor.h index bb39e328990..d3098df0531 100644 --- a/src/plugins/perforce/perforcesubmiteditor.h +++ b/src/plugins/perforce/perforcesubmiteditor.h @@ -10,8 +10,7 @@ namespace VcsBase { class SubmitFileModel; } -namespace Perforce { -namespace Internal { +namespace Perforce::Internal { class PerforceSubmitEditorWidget; class PerforcePluginPrivate; @@ -50,5 +49,4 @@ private: VcsBase::SubmitFileModel *m_fileModel; }; -} // namespace Internal -} // namespace Perforce +} // Perforce::Internal diff --git a/src/plugins/perforce/perforcesubmiteditorwidget.cpp b/src/plugins/perforce/perforcesubmiteditorwidget.cpp index ca2675a880f..ddf4f1feb14 100644 --- a/src/plugins/perforce/perforcesubmiteditorwidget.cpp +++ b/src/plugins/perforce/perforcesubmiteditorwidget.cpp @@ -3,10 +3,12 @@ #include "perforcesubmiteditorwidget.h" +#include "perforcetr.h" + #include -#include -#include +#include +#include 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("Client:"), m_clientName, br, - tr("User:"), m_userName + Tr::tr("Change:"), m_changeNumber, br, + Tr::tr("Client:"), m_clientName, br, + Tr::tr("User:"), m_userName }.attachTo(this); } diff --git a/src/plugins/perforce/perforcetr.h b/src/plugins/perforce/perforcetr.h index d2477a1d665..cd33f4574d0 100644 --- a/src/plugins/perforce/perforcetr.h +++ b/src/plugins/perforce/perforcetr.h @@ -12,4 +12,4 @@ struct Tr Q_DECLARE_TR_FUNCTIONS(::Perforce) }; -} // namespace Perforce +} // Perforce