feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Mercurial: Convert to Tr::tr

Browse Source 
Change-Id: I2a6ecd17091ffa0100f982848afbf941c6997db7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
hjk
2022-10-06 13:08:30 +02:00
parent db5e3555ac
commit 47e5997e57
32 changed files with 163 additions and 654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
share/qtcreator/translations/qtcreator_cs.ts
View File

@@ -21107,7 +21107,7 @@ Můžete si vybrat mezi odložením změn nebo jejich vyhozením.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialCommitPanel</name>
<name>Mercurial</name>
<message>
<source>General Information</source>
<translation>Obecné informace</translation>
@@ -21140,9 +21140,6 @@ Můžete si vybrat mezi odložením změn nebo jejich vyhozením.</translation>
<source>Email:</source>
<translation>E-mailová adresa:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPage</name>
<message>
<source>Form</source>
<translation>Formulář</translation>
@@ -21199,17 +21196,10 @@ Můžete si vybrat mezi odložením změn nebo jejich vyhozením.</translation>
<source>Prompt on submit</source>
<translation>Ptát se na potvrzení</translation>
</message>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
<message>
<source>The number of recent commit logs to show, choose 0 to see all entries.</source>
<translation>Počet nedávných záznamů které se vypisují v historii změn. Při volbě 0 budou vidět všechny záznamy.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::RevertDialog</name>
<message>
<source>Revert</source>
<translation>Vrátit</translation>
@@ -21222,9 +21212,6 @@ Můžete si vybrat mezi odložením změn nebo jejich vyhozením.</translation>
<source>Revision:</source>
<translation>Revize:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::SrcDestDialog</name>
<message>
<source>Dialog</source>
<translation>Dialog</translation>
@@ -24663,7 +24650,7 @@ Proces Pdb po určité době od úspěšného spuštění spadl.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CloneWizard</name>
<name>Mercurial</name>
<message>
<source>Cloning</source>
<translation>Klonování</translation>
@@ -24680,9 +24667,6 @@ Proces Pdb po určité době od úspěšného spuštění spadl.</translation>
<source>Mercurial Clone</source>
<translation>Klon Mercurialu</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CloneWizardPage</name>
<message>
<source>Location</source>
<translation>Umístění</translation>
@@ -24695,16 +24679,10 @@ Proces Pdb po určité době od úspěšného spuštění spadl.</translation>
<source>Clone URL:</source>
<translation>Klonovat z adresy (URL):</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CommitEditor</name>
<message>
<source>Commit Editor</source>
<translation>Editor zápisu (commit)</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialClient</name>
<message>
<source>Unable to find parent revisions of %1 in %2: %3</source>
<translation>Nadřazenou revizi %1 ve skladišti %2 se nepodařilo určit: %3</translation>
@@ -24737,16 +24715,6 @@ Proces Pdb po určité době od úspěšného spuštění spadl.</translation>
<source>Working...</source>
<translation type="obsolete">Pracuje...</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialControl</name>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialEditor</name>
<message>
<source>Annotate %1</source>
<translation>Vypsat anotace pro %1</translation>
@@ -24755,9 +24723,6 @@ Proces Pdb po určité době od úspěšného spuštění spadl.</translation>
<source>Annotate parent revision %1</source>
<translation>Vypsat anotace nadřazené revize &quot;%1&quot;</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialJobRunner</name>
<message>
<source>Executing: %1 %2
</source>
@@ -24772,9 +24737,6 @@ Proces Pdb po určité době od úspěšného spuštění spadl.</translation>
<source>Timed out after %1s waiting for mercurial process to finish.</source>
<translation type="obsolete">Překročení času %1s při čekání na ukončení Procesu Mercurialu.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialPlugin</name>
<message>
<source>Mercurial</source>
<translation type="obsolete">Mercurial</translation>
@@ -24991,9 +24953,6 @@ Proces Pdb po určité době od úspěšného spuštění spadl.</translation>
<source>Message check failed. Do you want to proceed?</source>
<translation>Ověření popisu se nezdařilo. Přesto chcete pokračovat?</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPageWidget</name>
<message>
<source>Mercurial Command</source>
<translation>Příkaz &apos;Mercurial&apos;</translation>
@@ -35134,7 +35093,7 @@ když bude zavolán mimo git bash.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialDiffParameterWidget</name>
<name>Mercurial</name>
<message>
<source>Ignore whitespace</source>
<translation>Nevšímat si bílých znaků</translation>
@@ -55320,11 +55279,7 @@ Lze používat části jmen, pokud jsou jednoznačné.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::AuthenticationDialog</name>
<message>
<source>Dialog</source>
<translation>Dialog</translation>
</message>
<name>Mercurial</name>
<message>
<source>User name:</source>
<translation>Uživatelské jméno:</translation>

43
share/qtcreator/translations/qtcreator_da.ts
View File

@@ -20641,7 +20641,7 @@ Fejl: %5</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::AuthenticationDialog</name>
<name>Mercurial</name>
<message>
<source>Dialog</source>
<translation>Dialog</translation>
@@ -20654,16 +20654,10 @@ Fejl: %5</translation>
<source>Password:</source>
<translation>Adgangskode:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CommitEditor</name>
<message>
<source>Commit Editor</source>
<translation>Commit-redigering</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialClient</name>
<message>
<source>Unable to find parent revisions of %1 in %2: %3</source>
<translation>Kunne ikke finde forælder revisioner af %1 i %2: %3</translation>
@@ -20680,9 +20674,6 @@ Fejl: %5</translation>
<source>Hg outgoing %1</source>
<translation>Hg udgående %1</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialCommitPanel</name>
<message>
<source>General Information</source>
<translation>Generel information</translation>
@@ -20715,16 +20706,10 @@ Fejl: %5</translation>
<source>Email:</source>
<translation>E-mail:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialControl</name>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialDiffConfig</name>
<message>
<source>Ignore Whitespace</source>
<translation>Ignorer blanktegn</translation>
@@ -20733,9 +20718,6 @@ Fejl: %5</translation>
<source>Ignore Blank Lines</source>
<translation>Ignorer tomme linjer</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialEditorWidget</name>
<message>
<source>&amp;Annotate %1</source>
<translation>&amp;Annotate %1</translation>
@@ -20744,9 +20726,6 @@ Fejl: %5</translation>
<source>Annotate &amp;parent revision %1</source>
<translation>Annotate &amp;forælder revision %1</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialPlugin</name>
<message>
<source>Me&amp;rcurial</source>
<translation>Me&amp;rcurial</translation>
@@ -20943,9 +20922,6 @@ Fejl: %5</translation>
<source>Message check failed. Do you want to proceed?</source>
<translation>Meddelelsestjek mislykkedes. Vil du fortsætte?</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPage</name>
<message>
<source>Configuration</source>
<translation>Konfiguration</translation>
@@ -20994,20 +20970,10 @@ Fejl: %5</translation>
<source>Log count:</source>
<translation>Log antal:</translation>
</message>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPageWidget</name>
<message>
<source>Mercurial Command</source>
<translation>Mercurial-kommando</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::RevertDialog</name>
<message>
<source>Revert</source>
<translation>Tilbagefør</translation>
@@ -21020,13 +20986,6 @@ Fejl: %5</translation>
<source>Revision:</source>
<translation>Revision:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::SrcDestDialog</name>
<message>
<source>Dialog</source>
<translation>Dialog</translation>
</message>
<message>
<source>Default Location</source>
<translation>Standard placering</translation>

34
share/qtcreator/translations/qtcreator_de.ts
View File

@@ -8638,7 +8638,7 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen.</translat
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialCommitPanel</name>
<name>Mercurial</name>
<message>
<source>General Information</source>
<translation>Allgemeine Informationen</translation>
@@ -8671,9 +8671,6 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen.</translat
<source>Email:</source>
<translation>E-Mail-Adresse:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPage</name>
<message>
<source>Configuration</source>
<translation>Konfiguration</translation>
@@ -8722,9 +8719,6 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen.</translat
<source>The number of recent commit logs to show, choose 0 to see all entries.</source>
<translation>Zahl der anzuzeigenden Logeinträge, 0 für unbegrenzt.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::RevertDialog</name>
<message>
<source>Revert</source>
<translation>Rückgängig machen</translation>
@@ -8737,9 +8731,6 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen.</translat
<source>Revision:</source>
<translation>Revision:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::SrcDestDialog</name>
<message>
<source>Dialog</source>
<translation>Dialog</translation>
@@ -9185,14 +9176,11 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen.</translat
</message>
</context>
<context>
<name>Mercurial::Internal::CommitEditor</name>
<name>Mercurial</name>
<message>
<source>Commit Editor</source>
<translation>Commit-Editor</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialClient</name>
<message>
<source>Unable to find parent revisions of %1 in %2: %3</source>
<translation>Die übergeordnete Revision von %1 im Repository %2 konnte nicht bestimmt werden: %3</translation>
@@ -9217,9 +9205,6 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen.</translat
<source>Mercurial Diff &quot;%1&quot;</source>
<translation>Mercurial Diff für &quot;%1&quot;</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialPlugin</name>
<message>
<source>Me&amp;rcurial</source>
<translation>Me&amp;rcurial</translation>
@@ -9392,17 +9377,10 @@ Sie können die Änderungen in einem Stash ablegen oder zurücksetzen.</translat
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPageWidget</name>
<message>
<source>Mercurial Command</source>
<translation>Ausführbare Datei</translation>
</message>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Perforce::Internal::PerforceChecker</name>
@@ -23088,11 +23066,7 @@ Teilnamen können verwendet werden, sofern sie eindeutig sind.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::AuthenticationDialog</name>
<message>
<source>Dialog</source>
<translation>Dialog</translation>
</message>
<name>Mercurial</name>
<message>
<source>Password:</source>
<translation>Passwort:</translation>
@@ -30445,7 +30419,7 @@ Wählt eine für Desktop-Entwicklung geeignete Qt-Version aus, sofern sie verfü
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialEditorWidget</name>
<name>Mercurial</name>
<message>
<source>&amp;Annotate %1</source>
<translation>&amp;Annotate %1</translation>

53
share/qtcreator/translations/qtcreator_fr.ts
View File

@@ -21302,7 +21302,7 @@ Vous pouvez choisir entre mettre les changements dans une remise ou de les aband
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialCommitPanel</name>
<name>Mercurial</name>
<message>
<source>General Information</source>
<translation>Informations générales</translation>
@@ -21335,9 +21335,6 @@ Vous pouvez choisir entre mettre les changements dans une remise ou de les aband
<source>Email:</source>
<translation>Email :</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPage</name>
<message>
<source>Form</source>
<translation>Formulaire</translation>
@@ -21394,17 +21391,10 @@ Vous pouvez choisir entre mettre les changements dans une remise ou de les aband
<source>Prompt on submit</source>
<translation>Invite lors du submit</translation>
</message>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
<message>
<source>The number of recent commit logs to show, choose 0 to see all entries.</source>
<translation>Le nombre de logs de commit récents à afficher, 0 pour tout afficher. </translation>
</message>
</context>
<context>
<name>Mercurial::Internal::RevertDialog</name>
<message>
<source>Revert</source>
<translation>Rétablir</translation>
@@ -21417,9 +21407,6 @@ Vous pouvez choisir entre mettre les changements dans une remise ou de les aband
<source>Revision:</source>
<translation>Révision :</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::SrcDestDialog</name>
<message>
<source>Dialog</source>
<translation>Boîte de dialogue</translation>
@@ -24738,7 +24725,7 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CloneWizard</name>
<name>Mercurial</name>
<message>
<source>Cloning</source>
<translation>Cloner</translation>
@@ -24755,9 +24742,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus.</translation>
<source>Mercurial Clone</source>
<translation>Clone de Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CloneWizardPage</name>
<message>
<source>Location</source>
<translation>Emplacement</translation>
@@ -24770,16 +24754,10 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus.</translation>
<source>Clone URL:</source>
<translation>URL de clone :</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CommitEditor</name>
<message>
<source>Commit Editor</source>
<translation>Faire un commit de l&apos;éditeur</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialClient</name>
<message>
<source>Unable to find parent revisions of %1 in %2: %3</source>
<translation>Impossible de trouver la révision parente de %1 dans %2 : %3</translation>
@@ -24812,16 +24790,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus.</translation>
<source>Working...</source>
<translation type="obsolete">Travail en cours...</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialControl</name>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialEditor</name>
<message>
<source>Annotate %1</source>
<translation>Annoter %1</translation>
@@ -24830,9 +24798,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus.</translation>
<source>Annotate parent revision %1</source>
<translation>Annoter la révision parente %1</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialJobRunner</name>
<message>
<source>Executing: %1 %2
</source>
@@ -24847,9 +24812,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus.</translation>
<source>Timed out after %1s waiting for mercurial process to finish.</source>
<translation type="obsolete">Interruption après %1s d&apos;attente que le processus mercurial se termine.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialPlugin</name>
<message>
<source>Mercurial</source>
<translation type="obsolete">Mercurial</translation>
@@ -25066,9 +25028,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus.</translation>
<source>Message check failed. Do you want to proceed?</source>
<translation>Vérification du message échouée. Voulez-vous continuer ?</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPageWidget</name>
<message>
<source>Mercurial Command</source>
<translation>Commande Mercurial</translation>
@@ -38664,7 +38623,7 @@ These files are preserved.</source>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialDiffParameterWidget</name>
<name>Mercurial</name>
<message>
<source>Ignore whitespace</source>
<translation>Ignorer les espaces</translation>
@@ -50983,11 +50942,7 @@ Les noms partiels peuvent êtres utilisé s&apos;ils ne sont pas ambigües.</tra
</message>
</context>
<context>
<name>Mercurial::Internal::AuthenticationDialog</name>
<message>
<source>Dialog</source>
<translation>Boîte de dialogue</translation>
</message>
<name>Mercurial</name>
<message>
<source>User name:</source>
<translation>Nom d&apos;utilisateur :</translation>

39
share/qtcreator/translations/qtcreator_hr.ts
View File

@@ -5027,7 +5027,7 @@ Greška: %5</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::AuthenticationDialog</name>
<name>Mercurial</name>
<message>
<source>Dialog</source>
<translation>Dijalog</translation>
@@ -5040,9 +5040,6 @@ Greška: %5</translation>
<source>Password:</source>
<translation>Lozinka:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialCommitPanel</name>
<message>
<source>General Information</source>
<translation>Opće informacije</translation>
@@ -5075,9 +5072,6 @@ Greška: %5</translation>
<source>Email:</source>
<translation>E-pošta:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPage</name>
<message>
<source>Configuration</source>
<translation>Konfiguracija</translation>
@@ -5126,13 +5120,6 @@ Greška: %5</translation>
<source>Log count:</source>
<translation>Broj zapisa:</translation>
</message>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::RevertDialog</name>
<message>
<source>Revert</source>
<translation>Vrati natrag</translation>
@@ -5145,13 +5132,6 @@ Greška: %5</translation>
<source>Revision:</source>
<translation>Revizija:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::SrcDestDialog</name>
<message>
<source>Dialog</source>
<translation>Dijalog</translation>
</message>
<message>
<source>Default Location</source>
<translation>Zadano mjesto</translation>
@@ -26913,14 +26893,11 @@ Rok upotrebe: %3</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CommitEditor</name>
<name>Mercurial</name>
<message>
<source>Commit Editor</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialClient</name>
<message>
<source>Unable to find parent revisions of %1 in %2: %3</source>
<translation type="unfinished"></translation>
@@ -26945,16 +26922,10 @@ Rok upotrebe: %3</translation>
<source>Mercurial Diff &quot;%1&quot;</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialControl</name>
<message>
<source>Mercurial</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialEditorWidget</name>
<message>
<source>&amp;Annotate %1</source>
<translation type="unfinished"></translation>
@@ -26963,9 +26934,6 @@ Rok upotrebe: %3</translation>
<source>Annotate &amp;parent revision %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialPlugin</name>
<message>
<source>Me&amp;rcurial</source>
<translation type="unfinished"></translation>
@@ -27134,9 +27102,6 @@ Rok upotrebe: %3</translation>
<source>Commit changes for &quot;%1&quot;.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPageWidget</name>
<message>
<source>Mercurial Command</source>
<translation>Mercurial naredba</translation>

49
share/qtcreator/translations/qtcreator_ja.ts
View File

@@ -3836,7 +3836,7 @@ Add, modify, and remove document filters, which determine the documentation set
</message>
</context>
<context>
<name>Mercurial::Internal::AuthenticationDialog</name>
<name>Mercurial</name>
<message>
<source>Dialog</source>
<translation>ダイアログ</translation>
@@ -3849,9 +3849,6 @@ Add, modify, and remove document filters, which determine the documentation set
<source>Username:</source>
<translation>ユーザー名:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialCommitPanel</name>
<message>
<source>General Information</source>
<translation>概要</translation>
@@ -3884,9 +3881,6 @@ Add, modify, and remove document filters, which determine the documentation set
<source>Email:</source>
<translation>メールアドレス:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPage</name>
<message>
<source>Form</source>
<translation>フォーム</translation>
@@ -3943,9 +3937,6 @@ Add, modify, and remove document filters, which determine the documentation set
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::RevertDialog</name>
<message>
<source>Revert</source>
<translation>元に戻す</translation>
@@ -3958,13 +3949,6 @@ Add, modify, and remove document filters, which determine the documentation set
<source>Revision:</source>
<translation>リビジョン:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::SrcDestDialog</name>
<message>
<source>Dialog</source>
<translation>ダイアログ</translation>
</message>
<message>
<source>Default Location</source>
<translation>既定のパス</translation>
@@ -22288,14 +22272,11 @@ instead of its installation directory when run outside git bash.</source>
</message>
</context>
<context>
<name>Mercurial::Internal::CommitEditor</name>
<name>Mercurial</name>
<message>
<source>Commit Editor</source>
<translation>コミットエディタ</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialClient</name>
<message>
<source>Unable to find parent revisions of %1 in %2: %3</source>
<translation>%2 (リビジョン: %1) の親リビジョンが見つかりません: %3</translation>
@@ -22320,9 +22301,6 @@ instead of its installation directory when run outside git bash.</source>
<source>Mercurial Diff &quot;%1&quot;</source>
<translation>Mercurial 差分 &quot;%1&quot;</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialDiffParameterWidget</name>
<message>
<source>Ignore Whitespace</source>
<translation>空白を無視</translation>
@@ -22331,16 +22309,6 @@ instead of its installation directory when run outside git bash.</source>
<source>Ignore Blank Lines</source>
<translation>空行を無視</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialControl</name>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialPlugin</name>
<message>
<source>Me&amp;rcurial</source>
<translation>Me&amp;rcurial</translation>
@@ -22497,10 +22465,6 @@ instead of its installation directory when run outside git bash.</source>
<source>Incoming Source</source>
<translation>サーバーとの差分検出</translation>
</message>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
<message>
<source>Commit</source>
<translation>コミット</translation>
@@ -22541,17 +22505,10 @@ instead of its installation directory when run outside git bash.</source>
<source>Message check failed. Do you want to proceed?</source>
<translation>メッセージチェックに失敗しました。続けて処理しますか？</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPageWidget</name>
<message>
<source>Mercurial Command</source>
<translation>Mercurial コマンド</translation>
</message>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Perforce::Internal::PerforceChecker</name>
@@ -42101,7 +42058,7 @@ Would you like to overwrite it?</source>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialEditorWidget</name>
<name>Mercurial</name>
<message>
<source>&amp;Annotate %1</source>
<translation>%1 のアノテーション(&amp;A)</translation>

39
share/qtcreator/translations/qtcreator_pl.ts
View File

@@ -10126,7 +10126,7 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialCommitPanel</name>
<name>Mercurial</name>
<message>
<source>General Information</source>
<translation>Ogólne informacje</translation>
@@ -10159,9 +10159,6 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<source>Email:</source>
<translation>E-mail:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPage</name>
<message>
<source>Form</source>
<translation>Formularz</translation>
@@ -10218,9 +10215,6 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<source>The number of recent commit logs to show, choose 0 to see all entries.</source>
<translation>Liczba ostatnich poprawek, wyświetlanych w logu. Wybierz 0 aby ujrzeć wszystkie zmiany.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::RevertDialog</name>
<message>
<source>Revert</source>
<translation>Odwróć zmiany</translation>
@@ -10233,9 +10227,6 @@ Możesz odłożyć zmiany lub je porzucić.</translation>
<source>Revision:</source>
<translation>Wersja:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::SrcDestDialog</name>
<message>
<source>Dialog</source>
<translation>Dialog</translation>
@@ -11109,14 +11100,11 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM
</message>
</context>
<context>
<name>Mercurial::Internal::CommitEditor</name>
<name>Mercurial</name>
<message>
<source>Commit Editor</source>
<translation>Edytor poprawek</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialClient</name>
<message>
<source>Unable to find parent revisions of %1 in %2: %3</source>
<translation>Nie można odnaleźć macierzystej wersji dla %1 w %2: %3</translation>
@@ -11133,16 +11121,6 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM
<source>Hg outgoing %1</source>
<translation>Hg outgoing %1</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialControl</name>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialPlugin</name>
<message>
<source>Me&amp;rcurial</source>
<translation>Me&amp;rcurial</translation>
@@ -11339,9 +11317,6 @@ Dla projektów CMake, upewnij się, że zmienna QML_IMPORT_PATH jest obecna w CM
<source>Message check failed. Do you want to proceed?</source>
<translation>Błąd sprawdzania opisu. Czy kontynuować?</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPageWidget</name>
<message>
<source>Mercurial Command</source>
<translation>Komenda Mercurial</translation>
@@ -23825,11 +23800,7 @@ Można używać nazw częściowych, jeśli są one unikalne.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::AuthenticationDialog</name>
<message>
<source>Dialog</source>
<translation>Dialog</translation>
</message>
<name>Mercurial</name>
<message>
<source>Password:</source>
<translation>Hasło:</translation>
@@ -32459,7 +32430,7 @@ Use this only if you are prototyping. You cannot create a full application with
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialEditorWidget</name>
<name>Mercurial</name>
<message>
<source>&amp;Annotate %1</source>
<translation>Dołącz &amp;adnotację do %1</translation>
@@ -41758,7 +41729,7 @@ Termin wygaśnięcia: %3</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialDiffConfig</name>
<name>Mercurial</name>
<message>
<source>Ignore Whitespace</source>
<translation>Ignoruj białe znaki</translation>

37
share/qtcreator/translations/qtcreator_ru.ts
View File

@@ -26411,11 +26411,7 @@ Error: %5</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::AuthenticationDialog</name>
<message>
<source>Dialog</source>
<translation></translation>
</message>
<name>Mercurial</name>
<message>
<source>Password:</source>
<translation>Пароль:</translation>
@@ -26424,16 +26420,10 @@ Error: %5</translation>
<source>Username:</source>
<translation>Имя пользователя:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CommitEditor</name>
<message>
<source>Commit Editor</source>
<translation>Редактор фиксаций</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialClient</name>
<message>
<source>Unable to find parent revisions of %1 in %2: %3</source>
<translation>Не удалось найти родительскую ревизию для %1 в %2: %3</translation>
@@ -26458,9 +26448,6 @@ Error: %5</translation>
<source>Mercurial Diff &quot;%1&quot;</source>
<translation>Сравнение Mercurial «%1»</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialCommitPanel</name>
<message>
<source>General Information</source>
<translation>Основная информация</translation>
@@ -26493,9 +26480,6 @@ Error: %5</translation>
<source>Email:</source>
<translation>Email:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialEditorWidget</name>
<message>
<source>&amp;Annotate %1</source>
<translation>&amp;Аннотация %1</translation>
@@ -26504,9 +26488,6 @@ Error: %5</translation>
<source>Annotate &amp;parent revision %1</source>
<translation>Аннотация &amp;родительской ревизии %1</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialPlugin</name>
<message>
<source>Me&amp;rcurial</source>
<translation>Me&amp;rcurial</translation>
@@ -26679,9 +26660,6 @@ Error: %5</translation>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPage</name>
<message>
<source>Configuration</source>
<translation>Настройка</translation>
@@ -26731,20 +26709,10 @@ Error: %5</translation>
<translation>Количество отображаемых последних сообщений о фиксации,
выберите 0, чтобы видеть все.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPageWidget</name>
<message>
<source>Mercurial Command</source>
<translation>Команда Mercurial</translation>
</message>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::RevertDialog</name>
<message>
<source>Revert</source>
<translation>Откатить</translation>
@@ -26757,9 +26725,6 @@ Error: %5</translation>
<source>Revision:</source>
<translation>Ревизия:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::SrcDestDialog</name>
<message>
<source>Dialog</source>
<translation>Диалог</translation>

46
share/qtcreator/translations/qtcreator_sl.ts
View File

@@ -13696,7 +13696,7 @@ Spremembe lahko zapišete na stran ali pa jih zavržete.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialCommitPanel</name>
<name>Mercurial</name>
<message>
<source>General Information</source>
<translation>Splošni podatki</translation>
@@ -13736,9 +13736,6 @@ Spremembe lahko zapišete na stran ali pa jih zavržete.</translation>
<source>Email:</source>
<translation>E-pošta:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPage</name>
<message>
<source>Form</source>
<translation>Obrazec</translation>
@@ -13812,9 +13809,6 @@ Spremembe lahko zapišete na stran ali pa jih zavržete.</translation>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::RevertDialog</name>
<message>
<source>Revert</source>
<translation>Povrni</translation>
@@ -13829,9 +13823,6 @@ Spremembe lahko zapišete na stran ali pa jih zavržete.</translation>
<source>Revision:</source>
<translation>Revizija:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::SrcDestDialog</name>
<message>
<source>Dialog</source>
<translation>Pogovorno okno</translation>
@@ -16034,7 +16025,7 @@ Desetiška predznačena vrednost (najprej veliki konec): %4</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CloneWizard</name>
<name>Mercurial</name>
<message>
<source>Clones a Mercurial repository and tries to load the contained project.</source>
<translation>Sklonira skladišče Mercurial in poskusi naložiti vsebovani projekt.</translation>
@@ -16043,9 +16034,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4</translation>
<source>Mercurial Clone</source>
<translation>Klon skladišča Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CloneWizardPage</name>
<message>
<source>Location</source>
<translation>Mesto</translation>
@@ -16058,16 +16046,10 @@ Desetiška predznačena vrednost (najprej veliki konec): %4</translation>
<source>Clone URL:</source>
<translation>URL za kloniranje:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CommitEditor</name>
<message>
<source>Commit Editor</source>
<translation>Urejevalnik zapisov</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialClient</name>
<message>
<source>Unable to find parent revisions of %1 in %2: %3</source>
<translation>Ni moč najti starševskih revizij za %1 v %2: %3</translation>
@@ -16100,16 +16082,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4</translation>
<source>Working...</source>
<translation type="obsolete">Delam …</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialControl</name>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialEditor</name>
<message>
<source>Annotate %1</source>
<translation>Dodaj opombo za %1</translation>
@@ -16118,13 +16090,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4</translation>
<source>Annotate parent revision %1</source>
<translation>Dodaj opombo za starševsko revizijo %1</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialPlugin</name>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
<message>
<source>Annotate Current File</source>
<translation>Dodaj opombo za trenutno datoteko</translation>
@@ -16317,9 +16282,6 @@ Desetiška predznačena vrednost (najprej veliki konec): %4</translation>
<source>Close commit editor</source>
<translation type="obsolete">Zapri urejevalnik za zapise</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPageWidget</name>
<message>
<source>Mercurial Command</source>
<translation>Ukaz Mercurial</translation>
@@ -24616,7 +24578,7 @@ ključe SSH išče na tem mestu in ne v mapi, kjer je nameščen.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialDiffParameterWidget</name>
<name>Mercurial</name>
<message>
<source>Ignore whitespace</source>
<translation>Prezri presledke</translation>
@@ -32237,7 +32199,7 @@ Preverite, ali je telefon priključen in ali App TRK teče.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialJobRunner</name>
<name>Mercurial</name>
<message>
<source>Executing: %1 %2
</source>

57
share/qtcreator/translations/qtcreator_uk.ts
View File

@@ -12239,7 +12239,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
</message>
</context>
<context>
<name>Mercurial::Internal::CloneWizard</name>
<name>Mercurial</name>
<message>
<source>Cloning</source>
<translation type="vanished">Клонування</translation>
@@ -12252,9 +12252,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<source>Clones a Mercurial repository and tries to load the contained project.</source>
<translation type="vanished">Клонує сховище Mercurial та намагається завантажити з нього проект.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CloneWizardPage</name>
<message>
<source>Location</source>
<translation type="vanished">Розташування</translation>
@@ -12263,16 +12260,10 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<source>Clone URL:</source>
<translation type="vanished">URL для клонування:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CommitEditor</name>
<message>
<source>Commit Editor</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialClient</name>
<message>
<source>Unable to find parent revisions of %1 in %2: %3</source>
<translation type="unfinished"></translation>
@@ -12289,9 +12280,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<source>Hg outgoing %1</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialCommitPanel</name>
<message>
<source>General Information</source>
<translation>Загальна інформація</translation>
@@ -12324,16 +12312,10 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<source>Email:</source>
<translation>Email:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialControl</name>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialDiffParameterWidget</name>
<message>
<source>Ignore whitespace</source>
<translation type="vanished">Ігнорувати пропуски</translation>
@@ -12350,13 +12332,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<source>Ignore Blank Lines</source>
<translation>Ігнорувати порожні рядки</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialPlugin</name>
<message>
<source>Clones a Mercurial repository and tries to load the contained project.</source>
<translation type="vanished">Клонує сховище Mercurial та намагається завантажити з нього проект.</translation>
</message>
<message>
<source>Me&amp;rcurial</source>
<translation>Me&amp;rcurial</translation>
@@ -12569,9 +12544,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<source>Message check failed. Do you want to proceed?</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPage</name>
<message>
<source>Form</source>
<translation>Форма</translation>
@@ -12620,24 +12592,14 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<source>s</source>
<translation> с</translation>
</message>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
<message>
<source>The number of recent commit logs to show, choose 0 to see all entries.</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPageWidget</name>
<message>
<source>Mercurial Command</source>
<translation>Команда Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::RevertDialog</name>
<message>
<source>Revert</source>
<translation type="unfinished"></translation>
@@ -12650,9 +12612,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t
<source>Revision:</source>
<translation>Ревізія:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::SrcDestDialog</name>
<message>
<source>Dialog</source>
<translation>Діалог</translation>
@@ -36445,11 +36404,7 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d
</message>
</context>
<context>
<name>Mercurial::Internal::AuthenticationDialog</name>
<message>
<source>Dialog</source>
<translation>Діалог</translation>
</message>
<name>Mercurial</name>
<message>
<source>User name:</source>
<translation type="vanished">Ім&apos;я користувача:</translation>
@@ -42314,11 +42269,7 @@ Install an SDK of at least API version %1.</source>
</message>
</context>
<context>
<name>Mercurial::Internal::CloneWizardFactory</name>
<message>
<source>Clones a Mercurial repository and tries to load the contained project.</source>
<translation type="vanished">Клонує сховище Mercurial та намагається завантажити з нього проект.</translation>
</message>
<name>Mercurial</name>
</context>
<context>
<name>ProjectExplorer::DeploymentDataModel</name>
@@ -47562,7 +47513,7 @@ Setting breakpoints by file name and line number may fail.</source>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialEditorWidget</name>
<name>Mercurial</name>
<message>
<source>&amp;Annotate %1</source>
<translation type="unfinished"></translation>

46
share/qtcreator/translations/qtcreator_zh_CN.ts
View File

@@ -19596,7 +19596,7 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialCommitPanel</name>
<name>Mercurial</name>
<message>
<source>General Information</source>
<translation>概要信息</translation>
@@ -19629,9 +19629,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<source>Email:</source>
<translation>电子邮件:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPage</name>
<message>
<source>Form</source>
<translation>界面</translation>
@@ -19700,9 +19697,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<source>The number of recent commit logs to show, choose 0 to see all entries.</source>
<translation>要显示的最近提交的日志数, 选择0 来查看所有项.</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::RevertDialog</name>
<message>
<source>Revert</source>
<translation>还原</translation>
@@ -19715,9 +19709,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<source>Revision:</source>
<translation>修订版本:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::SrcDestDialog</name>
<message>
<source>Dialog</source>
<translation>对话框</translation>
@@ -19847,7 +19838,7 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
</message>
</context>
<context>
<name>Mercurial::Internal::CloneWizard</name>
<name>Mercurial</name>
<message>
<source>Clone a Mercurial repository</source>
<translation type="obsolete">克隆一个 Mercurial 仓库</translation>
@@ -19860,9 +19851,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<source>Mercurial Clone</source>
<translation>Mercurial 克隆</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CloneWizardPage</name>
<message>
<source>Location</source>
<translation>位置</translation>
@@ -19875,16 +19863,10 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<source>Clone URL:</source>
<translation>克隆 URL:</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CommitEditor</name>
<message>
<source>Commit Editor</source>
<translation>Commit编辑器</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialClient</name>
<message>
<source>Unable to find parent revisions of %1 in %2: %3</source>
<translation>无法在 %2 找到 %1 的父修订版本: %3</translation>
@@ -19906,16 +19888,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<source>Working...</source>
<translation type="obsolete">工作中...</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialControl</name>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialJobRunner</name>
<message>
<source>Executing: %1 %2
</source>
@@ -19930,13 +19902,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<source>Timed out after %1s waiting for mercurial process to finish.</source>
<translation type="obsolete">等待 mercurial 进程结束，等待%1 秒后超时。</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialPlugin</name>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
<message>
<source>Annotate Current File</source>
<translation>Annotate 当前文件</translation>
@@ -20145,9 +20110,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e
<source>Message check failed. Do you want to proceed?</source>
<translation>信息检查失败，您想要继续吗？</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPageWidget</name>
<message>
<source>Mercurial Command</source>
<translation>Mercurial 命令</translation>
@@ -22488,7 +22450,7 @@ Previous decimal signed value (big endian): %4</source>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialEditor</name>
<name>Mercurial</name>
<message>
<source>Annotate %1</source>
<translation>注释 &quot;%1&quot; </translation>
@@ -35967,7 +35929,7 @@ These files are preserved.</source>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialDiffParameterWidget</name>
<name>Mercurial</name>
<message>
<source>Ignore whitespace</source>
<translation>忽略空白</translation>

43
share/qtcreator/translations/qtcreator_zh_TW.ts
View File

@@ -11870,7 +11870,7 @@ Reason: %2</source>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialCommitPanel</name>
<name>Mercurial</name>
<message>
<source>General Information</source>
<translation>一般資訊</translation>
@@ -11903,9 +11903,6 @@ Reason: %2</source>
<source>Email:</source>
<translation>電子郵件：</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPage</name>
<message>
<source>Form</source>
<translation>表單</translation>
@@ -11966,9 +11963,6 @@ Reason: %2</source>
<source>The number of recent commit logs to show, choose 0 to see all entries.</source>
<translation>要顯示的最近提交的紀錄數。選擇 0 表示看全部的紀錄。</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::RevertDialog</name>
<message>
<source>Revert</source>
<translation>復原</translation>
@@ -11981,9 +11975,6 @@ Reason: %2</source>
<source>Revision:</source>
<translation>版本：</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::SrcDestDialog</name>
<message>
<source>Dialog</source>
<translation>對話框</translation>
@@ -12101,7 +12092,7 @@ Reason: %2</source>
</message>
</context>
<context>
<name>Mercurial::Internal::CloneWizard</name>
<name>Mercurial</name>
<message>
<source>Clones a Mercurial repository and tries to load the contained project.</source>
<translation>複製一個 Mercurial 主目錄，並試著載入裡面包含的專案。</translation>
@@ -12110,9 +12101,6 @@ Reason: %2</source>
<source>Mercurial Clone</source>
<translation>Mercurial 複製</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CloneWizardPage</name>
<message>
<source>Location</source>
<translation>位置</translation>
@@ -12125,16 +12113,10 @@ Reason: %2</source>
<source>Clone URL:</source>
<translation>複製網址：</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::CommitEditor</name>
<message>
<source>Commit Editor</source>
<translation>提交編輯器</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialClient</name>
<message>
<source>Unable to find parent revisions of %1 in %2: %3</source>
<translation>無法在 %2 找到 %1 的父版本：%3</translation>
@@ -12151,20 +12133,6 @@ Reason: %2</source>
<source>Hg outgoing %1</source>
<translation>Hg 傳出 %1</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialControl</name>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialPlugin</name>
<message>
<source>Mercurial</source>
<translation>Mercurial</translation>
</message>
<message>
<source>Annotate Current File</source>
<translation>目前檔案最後註記</translation>
@@ -12361,9 +12329,6 @@ Reason: %2</source>
<source>Message check failed. Do you want to proceed?</source>
<translation>訊息檢查失敗。您要繼續嗎？</translation>
</message>
</context>
<context>
<name>Mercurial::Internal::OptionsPageWidget</name>
<message>
<source>Mercurial Command</source>
<translation>Mercurial 指令</translation>
@@ -13286,7 +13251,7 @@ For qmlproject projects, use the importPaths property to add import paths.</sour
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialEditor</name>
<name>Mercurial</name>
<message>
<source>Annotate %1</source>
<translation>最後註記 %1</translation>
@@ -22378,7 +22343,7 @@ These files are preserved.</source>
</message>
</context>
<context>
<name>Mercurial::Internal::MercurialDiffParameterWidget</name>
<name>Mercurial</name>
<message>
<source>Ignore whitespace</source>
<translation>忽略空白</translation>

6
src/plugins/mercurial/annotationhighlighter.cpp
View File

@@ -4,8 +4,7 @@
#include "annotationhighlighter.h"
#include "constants.h"
namespace Mercurial {
namespace Internal {
namespace Mercurial::Internal {
MercurialAnnotationHighlighter::MercurialAnnotationHighlighter(const ChangeNumbers &changeNumbers,
QTextDocument *document)
@@ -22,5 +21,4 @@ QString MercurialAnnotationHighlighter::changeNumber(const QString &block) const
return QString();
}
} // namespace Internal
} // namespace Mercurial
} // Mercurial::Internal

7
src/plugins/mercurial/annotationhighlighter.h
View File

@@ -4,10 +4,10 @@
#pragma once
#include <vcsbase/baseannotationhighlighter.h>
#include <QRegularExpression>
namespace Mercurial {
namespace Internal {
namespace Mercurial::Internal {
class MercurialAnnotationHighlighter : public VcsBase::BaseAnnotationHighlighter
{
@@ -20,5 +20,4 @@ private:
const QRegularExpression changeset;
};
} //namespace Internal
}// namespace Mercurial
} // Mercurial::Internal

6
src/plugins/mercurial/authenticationdialog.cpp
View File

@@ -3,6 +3,8 @@
#include "authenticationdialog.h"
#include "mercurialtr.h"
#include <utils/layoutbuilder.h>
#include <QDialogButtonBox>
@@ -26,8 +28,8 @@ AuthenticationDialog::AuthenticationDialog(const QString &username, const QStrin
Column {
Form {
tr("Username:"), m_username, br,
tr("Password:"), m_password
Tr::tr("Username:"), m_username, br,
Tr::tr("Password:"), m_password
},
buttonBox
}.attachTo(this);

2
src/plugins/mercurial/authenticationdialog.h
View File

@@ -13,8 +13,6 @@ namespace Mercurial::Internal {
class AuthenticationDialog : public QDialog
{
Q_OBJECT
public:
explicit AuthenticationDialog(const QString &username, const QString &password,
QWidget *parent = nullptr);

16
src/plugins/mercurial/commiteditor.cpp
View File

@@ -2,7 +2,9 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "commiteditor.h"
#include "mercurialcommitwidget.h"
#include "mercurialtr.h"
#include <coreplugin/idocument.h>
#include <vcsbase/submitfilemodel.h>
@@ -11,16 +13,15 @@
using namespace VcsBase;
namespace Mercurial {
namespace Internal {
namespace Mercurial::Internal {
CommitEditor::CommitEditor() :
VcsBaseSubmitEditor(new MercurialCommitWidget)
{
document()->setPreferredDisplayName(tr("Commit Editor"));
document()->setPreferredDisplayName(Tr::tr("Commit Editor"));
}
MercurialCommitWidget *CommitEditor::commitWidget()
MercurialCommitWidget *CommitEditor::commitWidget() const
{
return static_cast<MercurialCommitWidget *>(widget());
}
@@ -59,15 +60,14 @@ void CommitEditor::setFields(const QFileInfo &repositoryRoot, const QString &bra
setFileModel(fileModel);
}
QString CommitEditor::committerInfo()
QString CommitEditor::committerInfo() const
{
return commitWidget()->committer();
}
QString CommitEditor::repoRoot()
QString CommitEditor::repoRoot() const
{
return commitWidget()->repoRoot();
}
} // namespace Internal
} // namespace Mercurial
} // Mercurial::Internal

12
src/plugins/mercurial/commiteditor.h
View File

@@ -10,8 +10,7 @@
namespace VcsBase { class SubmitFileModel; }
namespace Mercurial {
namespace Internal {
namespace Mercurial::Internal {
class MercurialCommitWidget;
@@ -26,13 +25,12 @@ public:
const QString &userName, const QString &email,
const QList<VcsBase::VcsBaseClient::StatusItem> &repoStatus);
QString committerInfo();
QString repoRoot();
QString committerInfo() const;
QString repoRoot() const;
private:
MercurialCommitWidget *commitWidget();
MercurialCommitWidget *commitWidget() const;
VcsBase::SubmitFileModel *fileModel = nullptr;
};
} // namespace Internal
} // namespace Mercurial
} // Mercurial::Internal

6
src/plugins/mercurial/constants.h
View File

@@ -5,8 +5,7 @@
#include <QtGlobal>
namespace Mercurial {
namespace Constants {
namespace Mercurial::Constants {
enum { debug = 0 };
const char MERCURIAL_PLUGIN[] = "MercurialPlugin";
@@ -65,5 +64,4 @@ const char OUTGOING[] = "Mercurial.Action.Outgoing";
const char COMMIT[] = "Mercurial.Action.Commit";
const char CREATE_REPOSITORY[] = "Mercurial.Action.CreateRepository";
} // namespace Constants
} // namespace mercurial
} // Mercurial::Constants

22
src/plugins/mercurial/mercurialclient.cpp
View File

@@ -2,7 +2,9 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "mercurialclient.h"
#include "constants.h"
#include "mercurialtr.h"
#include <coreplugin/idocument.h>
@@ -31,8 +33,7 @@ using namespace DiffEditor;
using namespace Utils;
using namespace VcsBase;
namespace Mercurial {
namespace Internal {
namespace Mercurial::Internal {
class MercurialDiffEditorController : public VcsBaseDiffEditorController
{
@@ -163,13 +164,13 @@ static QString msgParentRevisionFailed(const FilePath &workingDirectory,
const QString &revision,
const QString &why)
{
return MercurialClient::tr("Unable to find parent revisions of %1 in %2: %3").
return Tr::tr("Unable to find parent revisions of %1 in %2: %3").
arg(revision, workingDirectory.toUserOutput(), why);
}
static inline QString msgParseParentsOutputFailed(const QString &output)
{
return MercurialClient::tr("Cannot parse output: %1").arg(output);
return Tr::tr("Cannot parse output: %1").arg(output);
}
QStringList MercurialClient::parentRevisionsSync(const FilePath &workingDirectory,
@@ -257,7 +258,7 @@ void MercurialClient::incoming(const FilePath &repositoryRoot, const QString &re
if (!repository.isEmpty())
id += QLatin1Char('/') + repository;
const QString title = tr("Hg incoming %1").arg(id);
const QString title = Tr::tr("Hg incoming %1").arg(id);
VcsBaseEditorWidget *editor = createVcsEditor(Constants::DIFFLOG_ID, title, repositoryRoot.toString(),
VcsBaseEditor::getCodec(repositoryRoot.toString()),
@@ -270,7 +271,7 @@ void MercurialClient::outgoing(const FilePath &repositoryRoot)
QStringList args;
args << QLatin1String("outgoing") << QLatin1String("-g") << QLatin1String("-p");
const QString title = tr("Hg outgoing %1").arg(repositoryRoot.toUserOutput());
const QString title = Tr::tr("Hg outgoing %1").arg(repositoryRoot.toUserOutput());
VcsBaseEditorWidget *editor = createVcsEditor(Constants::DIFFLOG_ID, title, repositoryRoot.toString(),
VcsBaseEditor::getCodec(repositoryRoot.toString()),
@@ -304,20 +305,20 @@ void MercurialClient::diff(const FilePath &workingDir, const QStringList &files,
QString fileName;
if (files.empty()) {
const QString title = tr("Mercurial Diff");
const QString title = Tr::tr("Mercurial Diff");
const QString sourceFile = VcsBaseEditor::getSource(workingDir, fileName);
const QString documentId = QString(Constants::MERCURIAL_PLUGIN)
+ ".DiffRepo." + sourceFile;
requestReload(documentId, sourceFile, title, workingDir, {"diff"});
} else if (files.size() == 1) {
fileName = files.at(0);
const QString title = tr("Mercurial Diff \"%1\"").arg(fileName);
const QString title = Tr::tr("Mercurial Diff \"%1\"").arg(fileName);
const QString sourceFile = VcsBaseEditor::getSource(workingDir, fileName);
const QString documentId = QString(Constants::MERCURIAL_PLUGIN)
+ ".DiffFile." + sourceFile;
requestReload(documentId, sourceFile, title, workingDir, {"diff", fileName});
} else {
const QString title = tr("Mercurial Diff \"%1\"").arg(workingDir.toString());
const QString title = Tr::tr("Mercurial Diff \"%1\"").arg(workingDir.toString());
const QString sourceFile = VcsBaseEditor::getSource(workingDir, fileName);
const QString documentId = QString(Constants::MERCURIAL_PLUGIN)
+ ".DiffFile." + workingDir.toString();
@@ -443,5 +444,4 @@ void MercurialClient::parsePullOutput(const QString &output)
emit needMerge();
}
} // namespace Internal
} // namespace Mercurial
} // Mercurial::Internal

6
src/plugins/mercurial/mercurialclient.h
View File

@@ -9,8 +9,7 @@
namespace VcsBase { class VcsBaseDiffEditorController; }
namespace Mercurial {
namespace Internal {
namespace Mercurial::Internal {
class MercurialDiffEditorController;
@@ -74,5 +73,4 @@ private:
void parsePullOutput(const QString &output);
};
} //namespace Internal
} //namespace Mercurial
} // Mercurial::Internal

29
src/plugins/mercurial/mercurialcommitwidget.cpp
View File

@@ -3,6 +3,8 @@
#include "mercurialcommitwidget.h"
#include "mercurialtr.h"
#include <texteditor/texteditorsettings.h>
#include <texteditor/fontsettings.h>
#include <texteditor/syntaxhighlighter.h>
@@ -12,23 +14,14 @@
#include <utils/layoutbuilder.h>
#include <utils/qtcassert.h>
#include <QLabel>
#include <QLineEdit>
#include <QRegularExpression>
#include <QSyntaxHighlighter>
#include <QTextEdit>
//see the git submit widget for details of the syntax Highlighter
#include <QtCore/QVariant>
#include <QtWidgets/QApplication>
#include <QtWidgets/QFormLayout>
#include <QtWidgets/QGroupBox>
#include <QtWidgets/QHBoxLayout>
#include <QtWidgets/QLabel>
#include <QtWidgets/QLineEdit>
#include <QtWidgets/QSpacerItem>
#include <QtWidgets/QVBoxLayout>
#include <QtWidgets/QWidget>
namespace Mercurial::Internal {
// Highlighter for Mercurial submit messages. Make the first line bold, indicates
@@ -99,8 +92,6 @@ void MercurialSubmitHighlighter::highlightBlock(const QString &text)
class MercurialCommitPanel : public QWidget
{
Q_DECLARE_TR_FUNCTIONS(Mercurial::Internal::MercurialCommitPanel)
public:
MercurialCommitPanel()
{
@@ -114,18 +105,18 @@ public:
Column {
Group {
title(tr("General Information")),
title(Tr::tr("General Information")),
Form {
tr("Repository:"), m_repositoryLabel, br,
tr("Branch:"), m_branchLabel,
Tr::tr("Repository:"), m_repositoryLabel, br,
Tr::tr("Branch:"), m_branchLabel,
}
},
Group {
title(tr("Commit Information")),
title(Tr::tr("Commit Information")),
Row {
Form {
tr("Author:"), m_authorLineEdit, br,
tr("Email:"), m_emailLineEdit,
Tr::tr("Author:"), m_authorLineEdit, br,
Tr::tr("Email:"), m_emailLineEdit,
},
}
}

13
src/plugins/mercurial/mercurialeditor.cpp
View File

@@ -2,10 +2,11 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "mercurialeditor.h"
#include "annotationhighlighter.h"
#include "constants.h"
#include "mercurialplugin.h"
#include "mercurialclient.h"
#include "mercurialtr.h"
#include <coreplugin/editormanager/editormanager.h>
#include <vcsbase/diffandloghighlighter.h>
@@ -19,8 +20,7 @@
using namespace Utils;
namespace Mercurial {
namespace Internal {
namespace Mercurial::Internal {
// use QRegularExpression::anchoredPattern() when minimum Qt is raised to 5.12+
MercurialEditorWidget::MercurialEditorWidget(MercurialClient *client) :
@@ -31,8 +31,8 @@ MercurialEditorWidget::MercurialEditorWidget(MercurialClient *client) :
{
setDiffFilePattern(Constants::DIFFIDENTIFIER);
setLogEntryPattern("^changeset:\\s+(\\S+)$");
setAnnotateRevisionTextFormat(tr("&Annotate %1"));
setAnnotatePreviousRevisionTextFormat(tr("Annotate &parent revision %1"));
setAnnotateRevisionTextFormat(Tr::tr("&Annotate %1"));
setAnnotatePreviousRevisionTextFormat(Tr::tr("Annotate &parent revision %1"));
setAnnotationEntryPattern(Constants::CHANGESETID12);
}
@@ -71,5 +71,4 @@ QStringList MercurialEditorWidget::annotationPreviousVersions(const QString &rev
return m_client->parentRevisionsSync(FilePath::fromString(workingDirectory), fi.fileName(), revision);
}
} // namespace Internal
} // namespace Mercurial
} // Mercurial::Internal

7
src/plugins/mercurial/mercurialeditor.h
View File

@@ -7,14 +7,12 @@
#include <QRegularExpression>
namespace Mercurial {
namespace Internal {
namespace Mercurial::Internal {
class MercurialClient;
class MercurialEditorWidget : public VcsBase::VcsBaseEditorWidget
{
Q_OBJECT
public:
explicit MercurialEditorWidget(MercurialClient *client);
@@ -32,5 +30,4 @@ private:
MercurialClient *m_client;
};
} // namespace Internal
} // namespace Mercurial
} // Mercurial::Internal

75
src/plugins/mercurial/mercurialplugin.cpp
View File

@@ -8,6 +8,7 @@
#include "mercurialclient.h"
#include "mercurialeditor.h"
#include "mercurialsettings.h"
#include "mercurialtr.h"
#include "revertdialog.h"
#include "srcdestdialog.h"
@@ -49,8 +50,7 @@ using namespace VcsBase;
using namespace Utils;
using namespace std::placeholders;
namespace Mercurial {
namespace Internal {
namespace Mercurial::Internal {
class MercurialTopicCache : public Core::IVersionControl::TopicCache
{
@@ -102,8 +102,6 @@ const VcsBaseSubmitEditorParameters submitEditorParameters {
class MercurialPluginPrivate final : public VcsBase::VcsBasePluginPrivate
{
Q_DECLARE_TR_FUNCTIONS(Mercurial::Internal::MercurialPlugin)
public:
MercurialPluginPrivate();
@@ -256,7 +254,7 @@ MercurialPluginPrivate::MercurialPluginPrivate()
const QString prefix = QLatin1String("hg");
m_commandLocator = new Core::CommandLocator("Mercurial", prefix, prefix, this);
m_commandLocator->setDescription(tr("Triggers a Mercurial version control operation."));
m_commandLocator->setDescription(Tr::tr("Triggers a Mercurial version control operation."));
createMenu(context);
@@ -268,7 +266,7 @@ void MercurialPluginPrivate::createMenu(const Core::Context &context)
// Create menu item for Mercurial
m_mercurialContainer = Core::ActionManager::createMenu("Mercurial.MercurialMenu");
QMenu *menu = m_mercurialContainer->menu();
menu->setTitle(tr("Me&rcurial"));
menu->setTitle(Tr::tr("Me&rcurial"));
createFileActions(context);
m_mercurialContainer->addSeparator(context);
@@ -287,54 +285,54 @@ void MercurialPluginPrivate::createFileActions(const Core::Context &context)
{
Core::Command *command;
annotateFile = new ParameterAction(tr("Annotate Current File"), tr("Annotate \"%1\""), ParameterAction::EnabledWithParameter, this);
annotateFile = new ParameterAction(Tr::tr("Annotate Current File"), Tr::tr("Annotate \"%1\""), ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(annotateFile, Utils::Id(Constants::ANNOTATE), context);
command->setAttribute(Core::Command::CA_UpdateText);
connect(annotateFile, &QAction::triggered, this, &MercurialPluginPrivate::annotateCurrentFile);
m_mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command);
diffFile = new ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this);
diffFile = new ParameterAction(Tr::tr("Diff Current File"), Tr::tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(diffFile, Utils::Id(Constants::DIFF), context);
command->setAttribute(Core::Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+H,Meta+D") : tr("Alt+G,Alt+D")));
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+H,Meta+D") : Tr::tr("Alt+G,Alt+D")));
connect(diffFile, &QAction::triggered, this, &MercurialPluginPrivate::diffCurrentFile);
m_mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command);
logFile = new ParameterAction(tr("Log Current File"), tr("Log \"%1\""), ParameterAction::EnabledWithParameter, this);
logFile = new ParameterAction(Tr::tr("Log Current File"), Tr::tr("Log \"%1\""), ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(logFile, Utils::Id(Constants::LOG), context);
command->setAttribute(Core::Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+H,Meta+L") : tr("Alt+G,Alt+L")));
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+H,Meta+L") : Tr::tr("Alt+G,Alt+L")));
connect(logFile, &QAction::triggered, this, &MercurialPluginPrivate::logCurrentFile);
m_mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command);
statusFile = new ParameterAction(tr("Status Current File"), tr("Status \"%1\""), ParameterAction::EnabledWithParameter, this);
statusFile = new ParameterAction(Tr::tr("Status Current File"), Tr::tr("Status \"%1\""), ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(statusFile, Utils::Id(Constants::STATUS), context);
command->setAttribute(Core::Command::CA_UpdateText);
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+H,Meta+S") : tr("Alt+G,Alt+S")));
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+H,Meta+S") : Tr::tr("Alt+G,Alt+S")));
connect(statusFile, &QAction::triggered, this, &MercurialPluginPrivate::statusCurrentFile);
m_mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command);
m_mercurialContainer->addSeparator(context);
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 = Core::ActionManager::registerAction(m_addAction, Utils::Id(Constants::ADD), context);
command->setAttribute(Core::Command::CA_UpdateText);
connect(m_addAction, &QAction::triggered, this, &MercurialPluginPrivate::addCurrentFile);
m_mercurialContainer->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 = Core::ActionManager::registerAction(m_deleteAction, Utils::Id(Constants::DELETE), context);
command->setAttribute(Core::Command::CA_UpdateText);
connect(m_deleteAction, &QAction::triggered, this, &MercurialPluginPrivate::promptToDeleteCurrentFile);
m_mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command);
revertFile = new ParameterAction(tr("Revert Current File..."), tr("Revert \"%1\"..."), ParameterAction::EnabledWithParameter, this);
revertFile = new ParameterAction(Tr::tr("Revert Current File..."), Tr::tr("Revert \"%1\"..."), ParameterAction::EnabledWithParameter, this);
command = Core::ActionManager::registerAction(revertFile, Utils::Id(Constants::REVERT), context);
command->setAttribute(Core::Command::CA_UpdateText);
connect(revertFile, &QAction::triggered, this, &MercurialPluginPrivate::revertCurrentFile);
@@ -394,28 +392,28 @@ void MercurialPluginPrivate::statusCurrentFile()
void MercurialPluginPrivate::createDirectoryActions(const Core::Context &context)
{
auto action = new QAction(tr("Diff"), this);
auto action = new QAction(Tr::tr("Diff"), this);
m_repositoryActionList.append(action);
Core::Command *command = Core::ActionManager::registerAction(action, Utils::Id(Constants::DIFFMULTI), context);
connect(action, &QAction::triggered, this, &MercurialPluginPrivate::diffRepository);
m_mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command);
action = new QAction(tr("Log"), this);
action = new QAction(Tr::tr("Log"), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Utils::Id(Constants::LOGMULTI), context);
connect(action, &QAction::triggered, this, &MercurialPluginPrivate::logRepository);
m_mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command);
action = new QAction(tr("Revert..."), this);
action = new QAction(Tr::tr("Revert..."), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Utils::Id(Constants::REVERTMULTI), context);
connect(action, &QAction::triggered, this, &MercurialPluginPrivate::revertMulti);
m_mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command);
action = new QAction(tr("Status"), this);
action = new QAction(Tr::tr("Status"), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Utils::Id(Constants::STATUSMULTI), context);
connect(action, &QAction::triggered, this, &MercurialPluginPrivate::statusMulti);
@@ -458,57 +456,57 @@ void MercurialPluginPrivate::statusMulti()
void MercurialPluginPrivate::createRepositoryActions(const Core::Context &context)
{
auto action = new QAction(tr("Pull..."), this);
auto action = new QAction(Tr::tr("Pull..."), this);
m_repositoryActionList.append(action);
Core::Command *command = Core::ActionManager::registerAction(action, Utils::Id(Constants::PULL), context);
connect(action, &QAction::triggered, this, &MercurialPluginPrivate::pull);
m_mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command);
action = new QAction(tr("Push..."), this);
action = new QAction(Tr::tr("Push..."), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Utils::Id(Constants::PUSH), context);
connect(action, &QAction::triggered, this, &MercurialPluginPrivate::push);
m_mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command);
action = new QAction(tr("Update..."), this);
action = new QAction(Tr::tr("Update..."), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Utils::Id(Constants::UPDATE), context);
connect(action, &QAction::triggered, this, &MercurialPluginPrivate::update);
m_mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command);
action = new QAction(tr("Import..."), this);
action = new QAction(Tr::tr("Import..."), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Utils::Id(Constants::IMPORT), context);
connect(action, &QAction::triggered, this, &MercurialPluginPrivate::import);
m_mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command);
action = new QAction(tr("Incoming..."), this);
action = new QAction(Tr::tr("Incoming..."), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Utils::Id(Constants::INCOMING), context);
connect(action, &QAction::triggered, this, &MercurialPluginPrivate::incoming);
m_mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command);
action = new QAction(tr("Outgoing..."), this);
action = new QAction(Tr::tr("Outgoing..."), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Utils::Id(Constants::OUTGOING), context);
connect(action, &QAction::triggered, this, &MercurialPluginPrivate::outgoing);
m_mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command);
action = new QAction(tr("Commit..."), this);
action = new QAction(Tr::tr("Commit..."), this);
m_repositoryActionList.append(action);
command = Core::ActionManager::registerAction(action, Utils::Id(Constants::COMMIT), context);
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? tr("Meta+H,Meta+C") : tr("Alt+G,Alt+C")));
command->setDefaultKeySequence(QKeySequence(Core::useMacShortcuts ? Tr::tr("Meta+H,Meta+C") : Tr::tr("Alt+G,Alt+C")));
connect(action, &QAction::triggered, this, &MercurialPluginPrivate::commit);
m_mercurialContainer->addAction(command);
m_commandLocator->appendCommand(command);
m_createRepositoryAction = new QAction(tr("Create Repository..."), this);
m_createRepositoryAction = new QAction(Tr::tr("Create Repository..."), this);
command = Core::ActionManager::registerAction(m_createRepositoryAction, Utils::Id(Constants::CREATE_REPOSITORY), context);
connect(m_createRepositoryAction, &QAction::triggered, this, &MercurialPluginPrivate::createRepository);
m_mercurialContainer->addAction(command);
@@ -520,7 +518,7 @@ void MercurialPluginPrivate::pull()
QTC_ASSERT(state.hasTopLevel(), return);
SrcDestDialog dialog(state, SrcDestDialog::incoming, Core::ICore::dialogParent());
dialog.setWindowTitle(tr("Pull Source"));
dialog.setWindowTitle(Tr::tr("Pull Source"));
if (dialog.exec() != QDialog::Accepted)
return;
m_client.synchronousPull(dialog.workingDir(), dialog.getRepositoryString());
@@ -532,7 +530,7 @@ void MercurialPluginPrivate::push()
QTC_ASSERT(state.hasTopLevel(), return);
SrcDestDialog dialog(state, SrcDestDialog::outgoing, Core::ICore::dialogParent());
dialog.setWindowTitle(tr("Push Destination"));
dialog.setWindowTitle(Tr::tr("Push Destination"));
if (dialog.exec() != QDialog::Accepted)
return;
m_client.synchronousPush(dialog.workingDir(), dialog.getRepositoryString());
@@ -544,7 +542,7 @@ void MercurialPluginPrivate::update()
QTC_ASSERT(state.hasTopLevel(), return);
RevertDialog updateDialog(Core::ICore::dialogParent());
updateDialog.setWindowTitle(tr("Update"));
updateDialog.setWindowTitle(Tr::tr("Update"));
if (updateDialog.exec() != QDialog::Accepted)
return;
m_client.update(state.topLevel(), updateDialog.revision());
@@ -572,7 +570,7 @@ void MercurialPluginPrivate::incoming()
QTC_ASSERT(state.hasTopLevel(), return);
SrcDestDialog dialog(state, SrcDestDialog::incoming, Core::ICore::dialogParent());
dialog.setWindowTitle(tr("Incoming Source"));
dialog.setWindowTitle(Tr::tr("Incoming Source"));
if (dialog.exec() != QDialog::Accepted)
return;
m_client.incoming(state.topLevel(), dialog.getRepositoryString());
@@ -608,7 +606,7 @@ void MercurialPluginPrivate::showCommitWidget(const QList<VcsBaseClient::StatusI
disconnect(&m_client, &MercurialClient::parsedStatus, this, &MercurialPluginPrivate::showCommitWidget);
if (status.isEmpty()) {
VcsOutputWindow::appendError(tr("There are no changes to commit."));
VcsOutputWindow::appendError(Tr::tr("There are no changes to commit."));
return;
}
@@ -623,7 +621,7 @@ void MercurialPluginPrivate::showCommitWidget(const QList<VcsBaseClient::StatusI
Core::IEditor *editor = Core::EditorManager::openEditor(saver.filePath(), Constants::COMMIT_ID);
if (!editor) {
VcsOutputWindow::appendError(tr("Unable to create an editor for the commit."));
VcsOutputWindow::appendError(Tr::tr("Unable to create an editor for the commit."));
return;
}
@@ -635,7 +633,7 @@ void MercurialPluginPrivate::showCommitWidget(const QList<VcsBaseClient::StatusI
this, &MercurialPluginPrivate::diffFromEditorSelected);
commitEditor->setCheckScriptWorkingDirectory(m_submitRepository);
const QString msg = tr("Commit changes for \"%1\".").arg(m_submitRepository.toUserOutput());
const QString msg = Tr::tr("Commit changes for \"%1\".").arg(m_submitRepository.toUserOutput());
commitEditor->document()->setPreferredDisplayName(msg);
const QString branch = vcsTopic(m_submitRepository);
@@ -716,7 +714,7 @@ void MercurialPluginPrivate::updateActions(VcsBasePluginPrivate::ActionState as)
QString MercurialPluginPrivate::displayName() const
{
return tr("Mercurial");
return Tr::tr("Mercurial");
}
Utils::Id MercurialPluginPrivate::id() const
@@ -896,5 +894,4 @@ void MercurialPlugin::testLogResolving()
}
#endif
} // namespace Internal
} // namespace Mercurial
} // Mercurial::Internal

6
src/plugins/mercurial/mercurialplugin.h
View File

@@ -5,8 +5,7 @@
#include <extensionsystem/iplugin.h>
namespace Mercurial {
namespace Internal {
namespace Mercurial::Internal {
class MercurialPlugin final : public ExtensionSystem::IPlugin
{
@@ -27,5 +26,4 @@ private slots:
};
} // namespace Internal
} // namespace Mercurial
} // Mercurial::Internal

27
src/plugins/mercurial/mercurialsettings.cpp
View File

@@ -4,6 +4,7 @@
#include "mercurialsettings.h"
#include "constants.h"
#include "mercurialtr.h"
#include <utils/layoutbuilder.h>
@@ -11,8 +12,7 @@
using namespace Utils;
namespace Mercurial {
namespace Internal {
namespace Mercurial::Internal {
MercurialSettings::MercurialSettings()
{
@@ -23,19 +23,19 @@ MercurialSettings::MercurialSettings()
binaryPath.setDisplayStyle(StringAspect::PathChooserDisplay);
binaryPath.setExpectedKind(PathChooser::ExistingCommand);
binaryPath.setDefaultValue(Constants::MERCURIALDEFAULT);
binaryPath.setDisplayName(tr("Mercurial Command"));
binaryPath.setDisplayName(Tr::tr("Mercurial Command"));
binaryPath.setHistoryCompleter("Bazaar.Command.History");
binaryPath.setLabelText(tr("Command:"));
binaryPath.setLabelText(Tr::tr("Command:"));
registerAspect(&userName);
userName.setDisplayStyle(StringAspect::LineEditDisplay);
userName.setLabelText(tr("Default username:"));
userName.setToolTip(tr("Username to use by default on commit."));
userName.setLabelText(Tr::tr("Default username:"));
userName.setToolTip(Tr::tr("Username to use by default on commit."));
registerAspect(&userEmail);
userEmail.setDisplayStyle(StringAspect::LineEditDisplay);
userEmail.setLabelText(tr("Default email:"));
userEmail.setToolTip(tr("Email to use by default on commit."));
userEmail.setLabelText(Tr::tr("Default email:"));
userEmail.setToolTip(Tr::tr("Email to use by default on commit."));
registerAspect(&diffIgnoreWhiteSpace);
diffIgnoreWhiteSpace.setSettingsKey("diffIgnoreWhiteSpace");
@@ -49,7 +49,7 @@ MercurialSettings::MercurialSettings()
MercurialSettingsPage::MercurialSettingsPage(MercurialSettings *settings)
{
setId(VcsBase::Constants::VCS_ID_MERCURIAL);
setDisplayName(MercurialSettings::tr("Mercurial"));
setDisplayName(Tr::tr("Mercurial"));
setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
setSettings(settings);
@@ -59,12 +59,12 @@ MercurialSettingsPage::MercurialSettingsPage(MercurialSettings *settings)
Column {
Group {
title(MercurialSettings::tr("Configuration")),
title(Tr::tr("Configuration")),
Row { s.binaryPath }
},
Group {
title(MercurialSettings::tr("User")),
title(Tr::tr("User")),
Form {
s.userName,
s.userEmail
@@ -72,7 +72,7 @@ MercurialSettingsPage::MercurialSettingsPage(MercurialSettings *settings)
},
Group {
title(MercurialSettings::tr("Miscellaneous")),
title(Tr::tr("Miscellaneous")),
Row {
s.logCount,
s.timeout,
@@ -85,5 +85,4 @@ MercurialSettingsPage::MercurialSettingsPage(MercurialSettings *settings)
});
}
} // namespace Internal
} // namespace Mercurial
} // Mercurial::Internal

12
src/plugins/mercurial/mercurialsettings.h
View File

@@ -7,18 +7,15 @@
#include <vcsbase/vcsbaseclientsettings.h>
namespace Mercurial {
namespace Internal {
namespace Mercurial::Internal {
class MercurialSettings : public VcsBase::VcsBaseSettings
{
Q_DECLARE_TR_FUNCTIONS(Mercurial::Internal::MercurialSettings)
public:
MercurialSettings();
Utils::StringAspect diffIgnoreWhiteSpace;
Utils::StringAspect diffIgnoreBlankLines;
MercurialSettings();
};
class MercurialSettingsPage final : public Core::IOptionsPage
@@ -27,5 +24,4 @@ public:
explicit MercurialSettingsPage(MercurialSettings *settings);
};
} // namespace Internal
} // namespace Mercurial
} // Mercurial::Internal

8
src/plugins/mercurial/revertdialog.cpp
View File

@@ -3,6 +3,8 @@
#include "revertdialog.h"
#include "mercurialtr.h"
#include <utils/layoutbuilder.h>
#include <QDialogButtonBox>
@@ -17,9 +19,9 @@ RevertDialog::RevertDialog(QWidget *parent)
: QDialog(parent)
{
resize(400, 162);
setWindowTitle(tr("Revert"));
setWindowTitle(Tr::tr("Revert"));
auto groupBox = new QGroupBox(tr("Specify a revision other than the default?"));
auto groupBox = new QGroupBox(Tr::tr("Specify a revision other than the default?"));
groupBox->setCheckable(true);
groupBox->setChecked(false);
@@ -30,7 +32,7 @@ RevertDialog::RevertDialog(QWidget *parent)
using namespace Layouting;
Form {
tr("Revision:"), m_revisionLineEdit,
Tr::tr("Revision:"), m_revisionLineEdit,
}.attachTo(groupBox, WithMargins);
Column {

2
src/plugins/mercurial/revertdialog.h
View File

@@ -13,8 +13,6 @@ namespace Mercurial::Internal {
class RevertDialog : public QDialog
{
Q_OBJECT
public:
RevertDialog(QWidget *parent = nullptr);
~RevertDialog() override;

14
src/plugins/mercurial/srcdestdialog.cpp
View File

@@ -2,6 +2,8 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "authenticationdialog.h"
#include "mercurialtr.h"
#include "srcdestdialog.h"
#include <utils/layoutbuilder.h>
@@ -25,13 +27,13 @@ SrcDestDialog::SrcDestDialog(const VcsBasePluginState &state, Direction dir, QWi
{
resize(400, 187);
m_defaultButton = new QRadioButton(tr("Default Location"));
m_defaultButton = new QRadioButton(Tr::tr("Default Location"));
m_defaultButton->setChecked(true);
m_localButton = new QRadioButton(tr("Local filesystem:"));
m_localButton = new QRadioButton(Tr::tr("Local filesystem:"));
auto urlButton = new QRadioButton(tr("Specify URL:"));
urlButton->setToolTip(tr("For example: 'https://[user[:pass]@]host[:port]/[path]'."));
auto urlButton = new QRadioButton(Tr::tr("Specify URL:"));
urlButton->setToolTip(Tr::tr("For example: 'https://[user[:pass]@]host[:port]/[path]'."));
m_localPathChooser = new Utils::PathChooser;
m_localPathChooser->setEnabled(false);
@@ -39,14 +41,14 @@ SrcDestDialog::SrcDestDialog(const VcsBasePluginState &state, Direction dir, QWi
m_localPathChooser->setHistoryCompleter("Hg.SourceDir.History");
m_urlLineEdit = new QLineEdit;
m_urlLineEdit->setToolTip(tr("For example: 'https://[user[:pass]@]host[:port]/[path]'.", nullptr));
m_urlLineEdit->setToolTip(Tr::tr("For example: 'https://[user[:pass]@]host[:port]/[path]'.", nullptr));
m_urlLineEdit->setEnabled(false);
QUrl repoUrl = getRepoUrl();
if (!repoUrl.password().isEmpty())
repoUrl.setPassword(QLatin1String("***"));
m_promptForCredentials = new QCheckBox(tr("Prompt for credentials"));
m_promptForCredentials = new QCheckBox(Tr::tr("Prompt for credentials"));
m_promptForCredentials->setChecked(!repoUrl.scheme().isEmpty() && repoUrl.scheme() != QLatin1String("file"));
auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok);

2
src/plugins/mercurial/srcdestdialog.h
View File

@@ -19,8 +19,6 @@ namespace Mercurial::Internal {
class SrcDestDialog : public QDialog
{
Q_OBJECT
public:
enum Direction { outgoing, incoming };