diff options
21 files changed, 97 insertions, 291 deletions
diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 6b87d64210..3ab8044799 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -13040,7 +13040,7 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf </message> </context> <context> - <name>Subversion::Internal::SettingsPage</name> + <name>::Subversion</name> <message> <source>Subversion Command:</source> <translation type="obsolete">Příkaz pro Subversion:</translation> @@ -13101,16 +13101,10 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf <source>Log count:</source> <translation>Počet záznamů omezit na:</translation> </message> -</context> -<context> - <name>Subversion::Internal::SettingsPageWidget</name> <message> <source>Subversion Command</source> <translation>Příkaz pro Subversion</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionPlugin</name> <message> <source>&Subversion</source> <translation>&Subversion</translation> @@ -13388,9 +13382,6 @@ Další podrobnosti hledejte v /etc/sysctl.d/10-ptrace.conf <source>Subversion did not respond within timeout limit (%1 ms).</source> <translation type="obsolete">Žádná odpověď od 'Subversion' v rámci časového omezení (%1 ms).</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionSubmitEditor</name> <message> <source>Subversion Submit</source> <translation>Odeslání Subversion (submit)</translation> @@ -18785,7 +18776,7 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e </message> </context> <context> - <name>Subversion::Internal::CheckoutWizard</name> + <name>::Subversion</name> <message> <source>Checks out a project from a Subversion repository.</source> <translation type="obsolete">Odhlásí projekt ze skladiště Subversion.</translation> @@ -18798,9 +18789,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e <source>Subversion Checkout</source> <translation>Projekt ze skladiště Subversion (checkout)</translation> </message> -</context> -<context> - <name>Subversion::Internal::CheckoutWizardPage</name> <message> <source>Specify repository, checkout directory and path.</source> <translation type="obsolete">Zadejte skladiště, adresář pro odhlášení a cestu.</translation> @@ -25857,7 +25845,7 @@ Vybere pro napodobovatele a přenosné cíle vhodné verze Qt, jsou-li dostupné </message> </context> <context> - <name>Subversion::Internal::SubversionEditor</name> + <name>::Subversion</name> <message> <source>Annotate revision "%1"</source> <translation>Opatřit anotacemi revizi "%1"</translation> @@ -36896,7 +36884,7 @@ Chcete je přidat do projektu?</html></translation> </message> </context> <context> - <name>Subversion::Internal::SubversionDiffParameterWidget</name> + <name>::Subversion</name> <message> <source>Ignore whitespace</source> <translation>Nevšímat si bílých znaků</translation> diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index e0721acab4..7967062ab9 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -33267,7 +33267,7 @@ med en adgangskode, som du kan indtaste herunder.</translation> </message> </context> <context> - <name>Subversion::Internal::SettingsPage</name> + <name>::Subversion</name> <message> <source>Configuration</source> <translation>Konfiguration</translation> @@ -33316,23 +33316,14 @@ med en adgangskode, som du kan indtaste herunder.</translation> <source>Subversion</source> <translation>Subversion</translation> </message> -</context> -<context> - <name>Subversion::Internal::SettingsPageWidget</name> <message> <source>Subversion Command</source> <translation>Subversion-kommando</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionEditorWidget</name> <message> <source>Annotate revision "%1"</source> <translation>Annotate revision "%1"</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionLogConfig</name> <message> <source>Verbose</source> <translation>Detaljeret</translation> @@ -33341,9 +33332,6 @@ med en adgangskode, som du kan indtaste herunder.</translation> <source>Show files changed in each revision</source> <translation>Vis filer som er ændret i hver revision</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionPlugin</name> <message> <source>&Subversion</source> <translation>&Subversion</translation> @@ -33560,9 +33548,6 @@ med en adgangskode, som du kan indtaste herunder.</translation> <source>No subversion executable specified.</source> <translation>Ingen subversion-eksekverbar angivet.</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionSubmitEditor</name> <message> <source>Subversion Submit</source> <translation>Subversion submit</translation> diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 2662410941..e5c05691e2 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -11639,7 +11639,7 @@ Rename %2 to %3 anyway?</source> </message> </context> <context> - <name>Subversion::Internal::SubversionPlugin</name> + <name>::Subversion</name> <message> <source>&Subversion</source> <translation>&Subversion</translation> @@ -11832,9 +11832,6 @@ Rename %2 to %3 anyway?</source> <source>No subversion executable specified.</source> <translation>Es wurde keine Subversion-Anwendung angegeben.</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionSubmitEditor</name> <message> <source>Subversion Submit</source> <translation>Subversion Submit</translation> @@ -34171,7 +34168,7 @@ Benutzen Sie dies nur für Prototypen. Sie können damit keine vollständige Anw </message> </context> <context> - <name>Subversion::Internal::SubversionEditorWidget</name> + <name>::Subversion</name> <message> <source>Annotate revision "%1"</source> <translation>Annotation für Revision "%1"</translation> @@ -40048,7 +40045,7 @@ Ablaufdatum: %3</translation> </message> </context> <context> - <name>Subversion::Internal::SubversionLogConfig</name> + <name>::Subversion</name> <message> <source>Verbose</source> <translation>Ausführlich</translation> @@ -55647,7 +55644,7 @@ Failed to open file "%1"</source> </message> </context> <context> - <name>Subversion::Internal::SubversionSettings</name> + <name>::Subversion</name> <message> <source>Subversion Command</source> <translation type="unfinished">Subversion-Kommando</translation> diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts index 5ebe805b6c..7c6075cdab 100644 --- a/share/qtcreator/translations/qtcreator_es.ts +++ b/share/qtcreator/translations/qtcreator_es.ts @@ -9350,7 +9350,7 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg </message> </context> <context> - <name>Subversion::Internal::SettingsPage</name> + <name>::Subversion</name> <message> <source>Subversion Command:</source> <translation>Comando Subversion:</translation> @@ -9378,16 +9378,10 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg <source>Prompt to submit</source> <translation type="unfinished">Preguntar antes de enviar</translation> </message> -</context> -<context> - <name>Subversion::Internal::SettingsPageWidget</name> <message> <source>Subversion Command</source> <translation>Comando Subversion</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionOutputWindow</name> <message> <source>Subversion Output</source> <translation type="obsolete">Salida de Subversion</translation> @@ -9396,9 +9390,6 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg <source>Subversion</source> <translation type="obsolete">Subversion</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionPlugin</name> <message> <source>&Subversion</source> <translation></translation> @@ -9584,9 +9575,6 @@ Para hacerlo, introduzca el atajo y un espacio en el campo Localización, y lueg <source>Subversion did not respond within timeout limit (%1 ms).</source> <translation>Subversion no ha respondido en el tiempo esperado (%1 ms). </translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionSubmitEditor</name> <message> <source>Subversion Submit</source> <translation>Envíar a Subversion</translation> @@ -12589,7 +12577,7 @@ Check if the phone is connected and the TRK application is running.</source> </message> </context> <context> - <name>Subversion::Internal::CheckoutWizard</name> + <name>::Subversion</name> <message> <source>Checks out a project from a Subversion repository.</source> <translation type="unfinished"></translation> @@ -12598,9 +12586,6 @@ Check if the phone is connected and the TRK application is running.</source> <source>Subversion Checkout</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Subversion::Internal::CheckoutWizardPage</name> <message> <source>Specify repository, checkout directory and path.</source> <translation type="unfinished"></translation> diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 3899ae4fa9..ea75e4930a 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -13191,7 +13191,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t </message> </context> <context> - <name>Subversion::Internal::SettingsPage</name> + <name>::Subversion</name> <message> <source>Prompt to submit</source> <translation type="obsolete">Invite lors du submit</translation> @@ -13252,28 +13252,15 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <source>Log count:</source> <translation>Nombre de log :</translation> </message> -</context> -<context> - <name>Subversion::Internal::SettingsPageWidget</name> <message> <source>Subversion Command</source> <translation>Commande Subversion</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionOutputWindow</name> <message> <source>Subversion Output</source> <translation type="obsolete">Sortie de Subversion</translation> </message> <message> - <source>Subversion</source> - <translation type="obsolete">Subversion</translation> - </message> -</context> -<context> - <name>Subversion::Internal::SubversionPlugin</name> - <message> <source>&Subversion</source> <translation>&Subversion</translation> </message> @@ -13555,9 +13542,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <source>Subversion did not respond within timeout limit (%1 ms).</source> <translation type="obsolete">Subversion n'a pas répondu après la limite de temps (%1 ms).</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionSubmitEditor</name> <message> <source>Subversion Submit</source> <translation>Submit sur Subversion</translation> @@ -17804,7 +17788,7 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e </message> </context> <context> - <name>Subversion::Internal::CheckoutWizard</name> + <name>::Subversion</name> <message> <source>Checks out a project from a Subversion repository.</source> <translation type="obsolete">Vérifie un projet à partir d'un dépôt Subversion.</translation> @@ -17817,9 +17801,6 @@ S60 emulator run configuration default display name, %1 is base pro-File name</e <source>Subversion Checkout</source> <translation>Import Subversion</translation> </message> -</context> -<context> - <name>Subversion::Internal::CheckoutWizardPage</name> <message> <source>Specify repository, checkout directory and path.</source> <translation type="obsolete">Spécifier le dépôt, le répertoire et le chemin de checkout.</translation> @@ -24846,7 +24827,7 @@ Preselects Qt for Simulator and mobile targets if available</source> </message> </context> <context> - <name>Subversion::Internal::SubversionEditor</name> + <name>::Subversion</name> <message> <source>Annotate revision "%1"</source> <translation>Révision annotée "%1"</translation> @@ -36123,7 +36104,7 @@ Remote error output was: %1</source> </message> </context> <context> - <name>Subversion::Internal::SubversionDiffParameterWidget</name> + <name>::Subversion</name> <message> <source>Ignore whitespace</source> <translation>Ignorer les espaces</translation> diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index 19ecc78b73..a24a169899 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -7696,7 +7696,7 @@ Sigurno želiš nastaviti?</translation> </message> </context> <context> - <name>Subversion::Internal::SettingsPage</name> + <name>::Subversion</name> <message> <source>Configuration</source> <translation>Konfiguracija</translation> @@ -33345,14 +33345,11 @@ Row: %4, Column: %5 </message> </context> <context> - <name>Subversion::Internal::SettingsPageWidget</name> + <name>::Subversion</name> <message> <source>Subversion Command</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionLogConfig</name> <message> <source>Verbose</source> <translation type="unfinished"></translation> @@ -33361,16 +33358,10 @@ Row: %4, Column: %5 <source>Show files changed in each revision</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionEditorWidget</name> <message> <source>Annotate revision "%1"</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionPlugin</name> <message> <source>&Subversion</source> <translation>&Subversion</translation> @@ -33559,9 +33550,6 @@ Row: %4, Column: %5 <source>No subversion executable specified.</source> <translation>Nijedan izvršni subversion nije specificiran.</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionSubmitEditor</name> <message> <source>Subversion Submit</source> <translation>Subversion Pošalji</translation> diff --git a/share/qtcreator/translations/qtcreator_hu.ts b/share/qtcreator/translations/qtcreator_hu.ts index 52c0862e6e..68e0545a09 100644 --- a/share/qtcreator/translations/qtcreator_hu.ts +++ b/share/qtcreator/translations/qtcreator_hu.ts @@ -15388,7 +15388,7 @@ Hogy ezt megtehesse, gépelje be ezt a gyorsbillentyűt és egy szóközt a Lok </message> </context> <context> - <name>Subversion::Internal::CheckoutWizard</name> + <name>::Subversion</name> <message> <source>Checks out a project from a Subversion repository.</source> <translation>Egy projekt megnézése a Subversion tárolóból.</translation> @@ -15397,9 +15397,6 @@ Hogy ezt megtehesse, gépelje be ezt a gyorsbillentyűt és egy szóközt a Lok <source>Subversion Checkout</source> <translation>Subversion megnézés</translation> </message> -</context> -<context> - <name>Subversion::Internal::CheckoutWizardPage</name> <message> <source>Specify repository, checkout directory and path.</source> <translation>Határozza meg a tárolók, megtekintése könytárat és az útvonalat.</translation> @@ -15408,9 +15405,6 @@ Hogy ezt megtehesse, gépelje be ezt a gyorsbillentyűt és egy szóközt a Lok <source>Repository:</source> <translation>Tároló:</translation> </message> -</context> -<context> - <name>Subversion::Internal::SettingsPage</name> <message> <source>Prompt to submit</source> <translation>Feltöltési prompt</translation> @@ -15435,16 +15429,10 @@ Hogy ezt megtehesse, gépelje be ezt a gyorsbillentyűt és egy szóközt a Lok <source>Subversion</source> <translation>Subversion</translation> </message> -</context> -<context> - <name>Subversion::Internal::SettingsPageWidget</name> <message> <source>Subversion Command</source> <translation>Subversion parancs</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionPlugin</name> <message> <source>&Subversion</source> <translation>&Subversion</translation> @@ -15618,9 +15606,6 @@ Hogy ezt megtehesse, gépelje be ezt a gyorsbillentyűt és egy szóközt a Lok <source>Subversion did not respond within timeout limit (%1 ms).</source> <translation>A subversion nem válaszol az időtúllépési határon belül (%1 ms).</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionSubmitEditor</name> <message> <source>Subversion Submit</source> <translation>Subversion feltöltés</translation> diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts index eff1a94ebf..b46d75d19d 100644 --- a/share/qtcreator/translations/qtcreator_it.ts +++ b/share/qtcreator/translations/qtcreator_it.ts @@ -9220,7 +9220,7 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da </message> </context> <context> - <name>Subversion::Internal::SettingsPage</name> + <name>::Subversion</name> <message> <source>Subversion Command:</source> <translation>Comando Subversion:</translation> @@ -9248,16 +9248,10 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da <source>Prompt to submit</source> <translation type="unfinished">Prompt del submit</translation> </message> -</context> -<context> - <name>Subversion::Internal::SettingsPageWidget</name> <message> <source>Subversion Command</source> <translation>Comando Subversion</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionOutputWindow</name> <message> <source>Subversion Output</source> <translation type="obsolete">Output di Subversion</translation> @@ -9266,9 +9260,6 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da <source>Subversion</source> <translation type="obsolete">Subversion</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionPlugin</name> <message> <source>&Subversion</source> <translation>&Subversion</translation> @@ -9454,9 +9445,6 @@ Per eseguire la ricerca, scrivi questo prefisso, uno spazio e poi il termine da <source>Subversion did not respond within timeout limit (%1 ms).</source> <translation>Subversion non ha risposto entro il limite di tempo (%1 ms).</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionSubmitEditor</name> <message> <source>Subversion Submit</source> <translation>Invio Subversion</translation> @@ -12337,7 +12325,7 @@ Check if the phone is connected and the TRK application is running.</source> </message> </context> <context> - <name>Subversion::Internal::CheckoutWizard</name> + <name>::Subversion</name> <message> <source>Checks out a project from a Subversion repository.</source> <translation type="unfinished"></translation> @@ -12346,9 +12334,6 @@ Check if the phone is connected and the TRK application is running.</source> <source>Subversion Checkout</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Subversion::Internal::CheckoutWizardPage</name> <message> <source>Specify repository, checkout directory and path.</source> <translation type="unfinished"></translation> diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index 22db1312b4..8fb205c3a9 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -5910,7 +5910,7 @@ Add, modify, and remove document filters, which determine the documentation set </message> </context> <context> - <name>Subversion::Internal::SettingsPage</name> + <name>::Subversion</name> <message> <source>Configuration</source> <translation>設定</translation> @@ -29337,19 +29337,12 @@ In addition, device connectivity will be tested.</source> </message> </context> <context> - <name>Subversion::Internal::SettingsPageWidget</name> + <name>::Subversion</name> <message> <source>Subversion Command</source> <translation>Subversion コマンド</translation> </message> <message> - <source>Subversion</source> - <translation>Subversion</translation> - </message> -</context> -<context> - <name>Subversion::Internal::SubversionPlugin</name> - <message> <source>&Subversion</source> <translation>&Subversion</translation> </message> @@ -29565,9 +29558,6 @@ In addition, device connectivity will be tested.</source> <source>No subversion executable specified.</source> <translation>subversion 実行ファイルが指定されていません。</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionSubmitEditor</name> <message> <source>Subversion Submit</source> <translation>Subversion コミット</translation> @@ -40970,7 +40960,7 @@ Android パッケージソースディレクトリのファイルはビルドデ </message> </context> <context> - <name>Subversion::Internal::SubversionLogParameterWidget</name> + <name>::Subversion</name> <message> <source>Verbose</source> <translation>冗長</translation> @@ -40979,9 +40969,6 @@ Android パッケージソースディレクトリのファイルはビルドデ <source>Show files changed in each revision</source> <translation>リビジョン毎の差分ファイルを表示する</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionEditorWidget</name> <message> <source>Annotate revision "%1"</source> <translation>リビジョン "%1" のアノテーション</translation> @@ -48500,11 +48487,7 @@ Row: %4, Column: %5 </message> </context> <context> - <name>Subversion::Internal::SubversionLogConfig</name> - <message> - <source>Show files changed in each revision</source> - <translation>リビジョン毎の差分ファイルを表示する</translation> - </message> + <name>::Subversion</name> </context> <context> <name>::TextEditor</name> diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 726c736422..bd2284bde0 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -1149,7 +1149,7 @@ </message> </context> <context> - <name>Subversion::Internal::SettingsPage</name> + <name>::Subversion</name> <message> <source>Authentication</source> <translation>Autoryzacja</translation> @@ -8552,14 +8552,11 @@ Wstępnie wybiera wersję desktopową Qt do budowania aplikacji (jeśli jest dos </message> </context> <context> - <name>Subversion::Internal::SettingsPageWidget</name> + <name>::Subversion</name> <message> <source>Subversion Command</source> <translation>Komenda Subversion</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionPlugin</name> <message> <source>&Subversion</source> <translation>&Subversion</translation> @@ -8776,9 +8773,6 @@ Wstępnie wybiera wersję desktopową Qt do budowania aplikacji (jeśli jest dos <source>No subversion executable specified.</source> <translation>Nie podano komendy programu subversion.</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionSubmitEditor</name> <message> <source>Subversion Submit</source> <translation>Utwórz poprawkę w Subversion</translation> @@ -31555,7 +31549,7 @@ Pliki z katalogu źródłowego pakietu Android są kopiowane do katalogu budowan </message> </context> <context> - <name>Subversion::Internal::SubversionEditorWidget</name> + <name>::Subversion</name> <message> <source>Annotate revision "%1"</source> <translation>Dołącz adnotację do wersji "%1"</translation> @@ -39938,7 +39932,7 @@ Termin wygaśnięcia: %3</translation> </message> </context> <context> - <name>Subversion::Internal::SubversionLogConfig</name> + <name>::Subversion</name> <message> <source>Verbose</source> <translation>Gadatliwy</translation> diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index d94b269531..7a65b12bcd 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -42678,7 +42678,7 @@ Row: %4, Column: %5 </message> </context> <context> - <name>Subversion::Internal::SettingsPage</name> + <name>::Subversion</name> <message> <source>Authentication</source> <translation>Авторизация</translation> @@ -42723,9 +42723,6 @@ Row: %4, Column: %5 <source>Username:</source> <translation>Имя пользователя:</translation> </message> -</context> -<context> - <name>Subversion::Internal::SettingsPageWidget</name> <message> <source>Subversion Command</source> <translation>Команда Subversion</translation> @@ -42734,16 +42731,10 @@ Row: %4, Column: %5 <source>Subversion</source> <translation>Subversion</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionEditorWidget</name> <message> <source>Annotate revision "%1"</source> <translation>Аннотация ревизии «%1»</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionLogConfig</name> <message> <source>Verbose</source> <translation>Подробно</translation> @@ -42752,9 +42743,6 @@ Row: %4, Column: %5 <source>Show files changed in each revision</source> <translation>Показывать изменяемые файлы в каждой ревизии</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionPlugin</name> <message> <source>&Subversion</source> <translation>&Subversion</translation> @@ -42943,9 +42931,6 @@ Row: %4, Column: %5 <source>No subversion executable specified.</source> <translation>Программа Subversion не указана.</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionSubmitEditor</name> <message> <source>Subversion Submit</source> <translation>Фиксация Subversion</translation> diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts index 16c9a4e384..454a6fbf80 100644 --- a/share/qtcreator/translations/qtcreator_sl.ts +++ b/share/qtcreator/translations/qtcreator_sl.ts @@ -8783,7 +8783,7 @@ Preselects a desktop Qt for building the application if available.</source> </message> </context> <context> - <name>Subversion::Internal::SettingsPage</name> + <name>::Subversion</name> <message> <source>Authentication</source> <translation>Overjanje</translation> @@ -8841,16 +8841,10 @@ Preselects a desktop Qt for building the application if available.</source> <source>Log count:</source> <translation>Dolžina dnevnika:</translation> </message> -</context> -<context> - <name>Subversion::Internal::SettingsPageWidget</name> <message> <source>Subversion Command</source> <translation>Ukaz Subversion</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionPlugin</name> <message> <source>&Subversion</source> <translation>&Subversion</translation> @@ -9095,9 +9089,6 @@ Preselects a desktop Qt for building the application if available.</source> <source>Subversion did not respond within timeout limit (%1 ms).</source> <translation type="obsolete">Subversion se v za to namenjenem času (%1 ms) ni odzval.</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionSubmitEditor</name> <message> <source>Subversion Submit</source> <translation>Pošiljanje Subversion</translation> @@ -12555,7 +12546,7 @@ Razlog: %2</translation> </message> </context> <context> - <name>Subversion::Internal::CheckoutWizard</name> + <name>::Subversion</name> <message> <source>Checks out a Subversion repository and tries to load the contained project.</source> <translation>Prevzame skladišče Subversion in poskusi naložiti vsebovani projekt.</translation> @@ -12564,9 +12555,6 @@ Razlog: %2</translation> <source>Subversion Checkout</source> <translation>Prevzem iz Subversion</translation> </message> -</context> -<context> - <name>Subversion::Internal::CheckoutWizardPage</name> <message> <source>Location</source> <translation>Mesto</translation> @@ -16815,7 +16803,7 @@ Projekte programov QML izvede pregledovalnik QML in jih ni potrebno zgraditi.</t </message> </context> <context> - <name>Subversion::Internal::SubversionEditor</name> + <name>::Subversion</name> <message> <source>Annotate revision "%1"</source> <translation>Dodaj opombo za revizijo »%1«</translation> @@ -27406,7 +27394,7 @@ Ali jih želite dodati v projekt?</translation> </message> </context> <context> - <name>Subversion::Internal::SubversionDiffParameterWidget</name> + <name>::Subversion</name> <message> <source>Ignore whitespace</source> <translation>Prezri presledke</translation> diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index ef83cc0766..86758a08bd 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -18534,7 +18534,7 @@ with a password, which you can enter below.</source> </message> </context> <context> - <name>Subversion::Internal::CheckoutWizardPage</name> + <name>::Subversion</name> <message> <source>Trust Server Certificate</source> <translation type="vanished">Довіряти сертифікату сервера</translation> @@ -18547,9 +18547,6 @@ with a password, which you can enter below.</source> <source>Repository:</source> <translation type="vanished">Сховище:</translation> </message> -</context> -<context> - <name>Subversion::Internal::SettingsPage</name> <message> <source>Configuration</source> <translation>Конфігурація</translation> @@ -18598,16 +18595,10 @@ with a password, which you can enter below.</source> <source>Subversion</source> <translation>Subversion</translation> </message> -</context> -<context> - <name>Subversion::Internal::SettingsPageWidget</name> <message> <source>Subversion Command</source> <translation>Команда Subversion</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionDiffParameterWidget</name> <message> <source>Ignore whitespace</source> <translation type="vanished">Ігнорувати пропуски</translation> @@ -18616,9 +18607,6 @@ with a password, which you can enter below.</source> <source>Ignore Whitespace</source> <translation type="vanished">Ігнорувати пропуски</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionPlugin</name> <message> <source>&Subversion</source> <translation>&Subversion</translation> @@ -18835,9 +18823,6 @@ with a password, which you can enter below.</source> <source>No subversion executable specified.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionSubmitEditor</name> <message> <source>Subversion Submit</source> <translation type="unfinished"></translation> @@ -40400,7 +40385,7 @@ The files in the Android package source directory are copied to the build direct </message> </context> <context> - <name>Subversion::Internal::SubversionEditorWidget</name> + <name>::Subversion</name> <message> <source>Annotate revision "%1"</source> <translation type="unfinished"></translation> @@ -41562,7 +41547,7 @@ Setting breakpoints by file name and line number may fail.</source> </message> </context> <context> - <name>Subversion::Internal::SubversionLogParameterWidget</name> + <name>::Subversion</name> <message> <source>Verbose</source> <translation>Детально</translation> diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index e7c93313e2..5e70d26c30 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -41767,14 +41767,11 @@ Failed to open file "%1"</source> </message> </context> <context> - <name>Subversion::Internal::SubversionEditorWidget</name> + <name>::Subversion</name> <message> <source>Annotate revision "%1"</source> <translation type="unfinished">注释修订版本 "%1"</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionLogConfig</name> <message> <source>Verbose</source> <translation type="unfinished">详细</translation> @@ -41783,9 +41780,6 @@ Failed to open file "%1"</source> <source>Show files changed in each revision</source> <translation type="unfinished">显示每个修订版本改变的文件</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionPlugin</name> <message> <source>&Subversion</source> <translation>&Subversion</translation> @@ -41978,9 +41972,6 @@ Failed to open file "%1"</source> <source>No subversion executable specified.</source> <translation type="unfinished"></translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionSettings</name> <message> <source>Subversion Command</source> <translation type="unfinished">Subversion 命令</translation> @@ -42033,9 +42024,6 @@ Failed to open file "%1"</source> <source>Miscellaneous</source> <translation type="unfinished">其它</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionSubmitEditor</name> <message> <source>Subversion Submit</source> <translation>Subversion提交</translation> diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts index 1a3c49214e..354149372f 100644 --- a/share/qtcreator/translations/qtcreator_zh_TW.ts +++ b/share/qtcreator/translations/qtcreator_zh_TW.ts @@ -8255,7 +8255,7 @@ To do this, you type this shortcut and a space in the Locator entry field, and t </message> </context> <context> - <name>Subversion::Internal::SettingsPage</name> + <name>::Subversion</name> <message> <source>Authentication</source> <translation>認證</translation> @@ -8304,16 +8304,10 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <source>Username:</source> <translation>使用者名稱：</translation> </message> -</context> -<context> - <name>Subversion::Internal::SettingsPageWidget</name> <message> <source>Subversion Command</source> <translation>Subversion 指令</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionPlugin</name> <message> <source>&Subversion</source> <translation>Subversion (&S)</translation> @@ -8530,9 +8524,6 @@ To do this, you type this shortcut and a space in the Locator entry field, and t <source>No subversion executable specified!</source> <translation>沒有指定 subversion 執行檔！</translation> </message> -</context> -<context> - <name>Subversion::Internal::SubversionSubmitEditor</name> <message> <source>Subversion Submit</source> <translation>Subversion 提交</translation> @@ -10925,7 +10916,7 @@ Reason: %2</source> </message> </context> <context> - <name>Subversion::Internal::CheckoutWizard</name> + <name>::Subversion</name> <message> <source>Checks out a Subversion repository and tries to load the contained project.</source> <translation>從 Subversion 主目錄中取出，並試著載入裡面包含的專案。</translation> @@ -10934,9 +10925,6 @@ Reason: %2</source> <source>Subversion Checkout</source> <translation>Subversion 取出</translation> </message> -</context> -<context> - <name>Subversion::Internal::CheckoutWizardPage</name> <message> <source>Location</source> <translation>位置</translation> @@ -13856,7 +13844,7 @@ Requires <b>Qt 4.7.4</b> or newer.</source> </message> </context> <context> - <name>Subversion::Internal::SubversionEditor</name> + <name>::Subversion</name> <message> <source>Annotate revision "%1"</source> <translation>註記版本 "%1"</translation> @@ -22479,7 +22467,7 @@ In addition, device connectivity will be tested.</source> </message> </context> <context> - <name>Subversion::Internal::SubversionDiffParameterWidget</name> + <name>::Subversion</name> <message> <source>Ignore whitespace</source> <translation>忽略空白</translation> diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp index 3812aabeb4..f496054da6 100644 --- a/src/plugins/subversion/subversionclient.cpp +++ b/src/plugins/subversion/subversionclient.cpp @@ -4,6 +4,7 @@ #include "subversionclient.h" #include "subversionconstants.h" #include "subversionsettings.h" +#include "subversiontr.h" #include <coreplugin/editormanager/editormanager.h> @@ -43,8 +44,8 @@ public: SubversionLogConfig(SubversionSettings &settings, QToolBar *toolBar) : VcsBaseEditorConfig(toolBar) { - mapSetting(addToggleButton("--verbose", tr("Verbose"), - tr("Show files changed in each revision")), + mapSetting(addToggleButton("--verbose", Tr::tr("Verbose"), + Tr::tr("Show files changed in each revision")), &settings.logVerbose); } }; @@ -177,7 +178,7 @@ SubversionDiffEditorController::SubversionDiffEditorController(IDocument *docume CommandLine command = process.commandLine(); command << SubversionClient::AddAuthOptions(); process.setCommand(command); - setDescription(tr("Waiting for data...")); + setDescription(Tr::tr("Waiting for data...")); return TaskAction::Continue; }; const auto onDescriptionDone = [this](const QtcProcess &process) { diff --git a/src/plugins/subversion/subversioneditor.cpp b/src/plugins/subversion/subversioneditor.cpp index 48139afcbf..cf27b606a2 100644 --- a/src/plugins/subversion/subversioneditor.cpp +++ b/src/plugins/subversion/subversioneditor.cpp @@ -6,6 +6,7 @@ #include "annotationhighlighter.h" #include "subversionconstants.h" +#include "subversiontr.h" #include <utils/qtcassert.h> #include <vcsbase/diffandloghighlighter.h> @@ -35,7 +36,7 @@ SubversionEditorWidget::SubversionEditorWidget() : */ setDiffFilePattern("^[-+]{3} ([^\\t]+)|^Index: .*|^=+$"); setLogEntryPattern("^(r\\d+) \\|"); - setAnnotateRevisionTextFormat(tr("Annotate revision \"%1\"")); + setAnnotateRevisionTextFormat(Tr::tr("Annotate revision \"%1\"")); setAnnotationEntryPattern("^(\\d+):"); } diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 6fdf331be0..1eedd61606 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -3,11 +3,12 @@ #include "subversionplugin.h" -#include "subversioneditor.h" #include "subversionclient.h" #include "subversionconstants.h" +#include "subversioneditor.h" #include "subversionsettings.h" #include "subversionsubmiteditor.h" +#include "subversiontr.h" #include <coreplugin/actionmanager/actioncontainer.h> #include <coreplugin/actionmanager/actionmanager.h> @@ -167,8 +168,6 @@ private: class SubversionPluginPrivate final : public VcsBase::VcsBasePluginPrivate { - Q_DECLARE_TR_FUNCTIONS(Subversion::Internal::SubversionPlugin) - public: SubversionPluginPrivate(); ~SubversionPluginPrivate() final; @@ -369,27 +368,27 @@ SubversionPluginPrivate::SubversionPluginPrivate() const QString prefix = QLatin1String("svn"); m_commandLocator = new CommandLocator("Subversion", prefix, prefix, this); - m_commandLocator->setDescription(tr("Triggers a Subversion version control operation.")); + m_commandLocator->setDescription(Tr::tr("Triggers a Subversion version control operation.")); // Register actions ActionContainer *toolsContainer = ActionManager::actionContainer(M_TOOLS); ActionContainer *subversionMenu = ActionManager::createMenu(Id(CMD_ID_SUBVERSION_MENU)); - subversionMenu->menu()->setTitle(tr("&Subversion")); + subversionMenu->menu()->setTitle(Tr::tr("&Subversion")); toolsContainer->addMenu(subversionMenu); m_menuAction = subversionMenu->menu()->menuAction(); Command *command; - m_diffCurrentAction = new ParameterAction(tr("Diff Current File"), tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this); + m_diffCurrentAction = new ParameterAction(Tr::tr("Diff Current File"), Tr::tr("Diff \"%1\""), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_diffCurrentAction, CMD_ID_DIFF_CURRENT, context); command->setAttribute(Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+S,Meta+D") : tr("Alt+S,Alt+D"))); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+S,Meta+D") : Tr::tr("Alt+S,Alt+D"))); connect(m_diffCurrentAction, &QAction::triggered, this, &SubversionPluginPrivate::diffCurrentFile); subversionMenu->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); @@ -397,7 +396,7 @@ SubversionPluginPrivate::SubversionPluginPrivate() subversionMenu->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); @@ -407,25 +406,25 @@ SubversionPluginPrivate::SubversionPluginPrivate() subversionMenu->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 = ActionManager::registerAction(m_addAction, CMD_ID_ADD, context); command->setAttribute(Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+S,Meta+A") : tr("Alt+S,Alt+A"))); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+S,Meta+A") : Tr::tr("Alt+S,Alt+A"))); connect(m_addAction, &QAction::triggered, this, &SubversionPluginPrivate::addCurrentFile); subversionMenu->addAction(command); m_commandLocator->appendCommand(command); - m_commitCurrentAction = new ParameterAction(tr("Commit Current File"), tr("Commit \"%1\""), ParameterAction::EnabledWithParameter, this); + m_commitCurrentAction = new ParameterAction(Tr::tr("Commit Current File"), Tr::tr("Commit \"%1\""), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_commitCurrentAction, CMD_ID_COMMIT_CURRENT, context); command->setAttribute(Command::CA_UpdateText); - command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+S,Meta+C") : tr("Alt+S,Alt+C"))); + command->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+S,Meta+C") : Tr::tr("Alt+S,Alt+C"))); connect(m_commitCurrentAction, &QAction::triggered, this, &SubversionPluginPrivate::startCommitCurrentFile); subversionMenu->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); @@ -433,7 +432,7 @@ SubversionPluginPrivate::SubversionPluginPrivate() subversionMenu->addAction(command); m_commandLocator->appendCommand(command); - m_revertAction = new ParameterAction(tr("Revert..."), tr("Revert \"%1\"..."), ParameterAction::EnabledWithParameter, this); + m_revertAction = new ParameterAction(Tr::tr("Revert..."), Tr::tr("Revert \"%1\"..."), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_revertAction, CMD_ID_REVERT, context); command->setAttribute(Command::CA_UpdateText); @@ -443,7 +442,7 @@ SubversionPluginPrivate::SubversionPluginPrivate() subversionMenu->addSeparator(context); - m_diffProjectAction = new ParameterAction(tr("Diff Project"), tr("Diff Project \"%1\""), ParameterAction::EnabledWithParameter, this); + m_diffProjectAction = new ParameterAction(Tr::tr("Diff Project"), Tr::tr("Diff Project \"%1\""), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_diffProjectAction, CMD_ID_DIFF_PROJECT, context); command->setAttribute(Command::CA_UpdateText); @@ -451,7 +450,7 @@ SubversionPluginPrivate::SubversionPluginPrivate() subversionMenu->addAction(command); m_commandLocator->appendCommand(command); - m_statusProjectAction = new ParameterAction(tr("Project Status"), tr("Status of Project \"%1\""), ParameterAction::EnabledWithParameter, this); + m_statusProjectAction = new ParameterAction(Tr::tr("Project Status"), Tr::tr("Status of Project \"%1\""), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_statusProjectAction, CMD_ID_STATUS, context); command->setAttribute(Command::CA_UpdateText); @@ -459,21 +458,21 @@ SubversionPluginPrivate::SubversionPluginPrivate() subversionMenu->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, &SubversionPluginPrivate::logProject); subversionMenu->addAction(command); m_commandLocator->appendCommand(command); - m_updateProjectAction = new ParameterAction(tr("Update Project"), tr("Update Project \"%1\""), ParameterAction::EnabledWithParameter, this); + m_updateProjectAction = new ParameterAction(Tr::tr("Update Project"), Tr::tr("Update Project \"%1\""), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_updateProjectAction, CMD_ID_UPDATE, context); connect(m_updateProjectAction, &QAction::triggered, this, &SubversionPluginPrivate::updateProject); command->setAttribute(Command::CA_UpdateText); subversionMenu->addAction(command); m_commandLocator->appendCommand(command); - m_commitProjectAction = new ParameterAction(tr("Commit Project"), tr("Commit Project \"%1\""), ParameterAction::EnabledWithParameter, this); + m_commitProjectAction = new ParameterAction(Tr::tr("Commit Project"), Tr::tr("Commit Project \"%1\""), ParameterAction::EnabledWithParameter, this); command = ActionManager::registerAction(m_commitProjectAction, CMD_ID_COMMIT_PROJECT, context); connect(m_commitProjectAction, &QAction::triggered, this, &SubversionPluginPrivate::startCommitProject); command->setAttribute(Command::CA_UpdateText); @@ -482,43 +481,43 @@ SubversionPluginPrivate::SubversionPluginPrivate() subversionMenu->addSeparator(context); - m_diffRepositoryAction = new QAction(tr("Diff Repository"), this); + m_diffRepositoryAction = new QAction(Tr::tr("Diff Repository"), this); command = ActionManager::registerAction(m_diffRepositoryAction, CMD_ID_REPOSITORYDIFF, context); connect(m_diffRepositoryAction, &QAction::triggered, this, &SubversionPluginPrivate::diffRepository); subversionMenu->addAction(command); m_commandLocator->appendCommand(command); - m_statusRepositoryAction = new QAction(tr("Repository Status"), this); + m_statusRepositoryAction = new QAction(Tr::tr("Repository Status"), this); command = ActionManager::registerAction(m_statusRepositoryAction, CMD_ID_REPOSITORYSTATUS, context); connect(m_statusRepositoryAction, &QAction::triggered, this, &SubversionPluginPrivate::statusRepository); subversionMenu->addAction(command); m_commandLocator->appendCommand(command); - m_logRepositoryAction = new QAction(tr("Log Repository"), this); + m_logRepositoryAction = new QAction(Tr::tr("Log Repository"), this); command = ActionManager::registerAction(m_logRepositoryAction, CMD_ID_REPOSITORYLOG, context); connect(m_logRepositoryAction, &QAction::triggered, this, &SubversionPluginPrivate::logRepository); subversionMenu->addAction(command); m_commandLocator->appendCommand(command); - m_updateRepositoryAction = new QAction(tr("Update Repository"), this); + m_updateRepositoryAction = new QAction(Tr::tr("Update Repository"), this); command = ActionManager::registerAction(m_updateRepositoryAction, CMD_ID_REPOSITORYUPDATE, context); connect(m_updateRepositoryAction, &QAction::triggered, this, &SubversionPluginPrivate::updateRepository); subversionMenu->addAction(command); m_commandLocator->appendCommand(command); - m_commitAllAction = new QAction(tr("Commit All Files"), this); + m_commitAllAction = new QAction(Tr::tr("Commit All Files"), this); command = ActionManager::registerAction(m_commitAllAction, CMD_ID_COMMIT_ALL, context); connect(m_commitAllAction, &QAction::triggered, this, &SubversionPluginPrivate::startCommitAll); subversionMenu->addAction(command); m_commandLocator->appendCommand(command); - 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, &SubversionPluginPrivate::slotDescribe); subversionMenu->addAction(command); - m_revertRepositoryAction = new QAction(tr("Revert Repository..."), this); + m_revertRepositoryAction = new QAction(Tr::tr("Revert Repository..."), this); command = ActionManager::registerAction(m_revertRepositoryAction, CMD_ID_REVERT_ALL, context); connect(m_revertRepositoryAction, &QAction::triggered, this, &SubversionPluginPrivate::revertAll); @@ -635,9 +634,9 @@ void SubversionPluginPrivate::revertAll() { const VcsBasePluginState state = currentState(); QTC_ASSERT(state.hasTopLevel(), return); - const QString title = tr("Revert repository"); + const QString title = Tr::tr("Revert repository"); if (QMessageBox::warning(ICore::dialogParent(), title, - tr("Revert all pending changes to the repository?"), + Tr::tr("Revert all pending changes to the repository?"), QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) return; // NoteL: Svn "revert ." doesn not work. @@ -646,7 +645,7 @@ void SubversionPluginPrivate::revertAll() args << QLatin1String("--recursive") << state.topLevel().toString(); const auto revertResponse = runSvn(state.topLevel(), args, RunFlags::ShowStdOut); if (revertResponse.result() != ProcessResult::FinishedWithSuccess) { - QMessageBox::warning(ICore::dialogParent(), title, tr("Revert failed: %1") + QMessageBox::warning(ICore::dialogParent(), title, Tr::tr("Revert failed: %1") .arg(revertResponse.exitMessage()), QMessageBox::Ok); return; } @@ -668,7 +667,7 @@ void SubversionPluginPrivate::revertCurrentFile() if (diffResponse.cleanedStdOut().isEmpty()) return; if (QMessageBox::warning(ICore::dialogParent(), QLatin1String("svn revert"), - tr("The file has been changed. Do you want to revert it?"), + Tr::tr("The file has been changed. Do you want to revert it?"), QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) { return; } @@ -733,7 +732,7 @@ void SubversionPluginPrivate::startCommit(const FilePath &workingDir, const QStr if (raiseSubmitEditor()) return; if (isCommitEditorOpen()) { - VcsOutputWindow::appendWarning(tr("Another commit is currently being executed.")); + VcsOutputWindow::appendWarning(Tr::tr("Another commit is currently being executed.")); return; } @@ -748,7 +747,7 @@ void SubversionPluginPrivate::startCommit(const FilePath &workingDir, const QStr // Get list of added/modified/deleted files const StatusList statusOutput = parseStatusOutput(response.cleanedStdOut()); if (statusOutput.empty()) { - VcsOutputWindow::appendWarning(tr("There are no modified files.")); + VcsOutputWindow::appendWarning(Tr::tr("There are no modified files.")); return; } m_commitRepository = workingDir; @@ -937,8 +936,8 @@ void SubversionPluginPrivate::slotDescribe() QInputDialog inputDialog(ICore::dialogParent()); inputDialog.setInputMode(QInputDialog::IntInput); inputDialog.setIntRange(1, INT_MAX); - inputDialog.setWindowTitle(tr("Describe")); - inputDialog.setLabelText(tr("Revision number:")); + inputDialog.setWindowTitle(Tr::tr("Describe")); + inputDialog.setLabelText(Tr::tr("Revision number:")); if (inputDialog.exec() != QDialog::Accepted) return; @@ -951,7 +950,7 @@ CommandResult SubversionPluginPrivate::runSvn(const FilePath &workingDir, QTextCodec *outputCodec, int timeoutMutiplier) const { if (m_settings.binaryPath.value().isEmpty()) - return CommandResult(ProcessResult::StartFailed, tr("No subversion executable specified.")); + return CommandResult(ProcessResult::StartFailed, Tr::tr("No subversion executable specified.")); const int timeoutS = m_settings.timeout.value() * timeoutMutiplier; return m_client->vcsSynchronousExec(workingDir, command, flags, timeoutS, outputCodec); diff --git a/src/plugins/subversion/subversionsettings.cpp b/src/plugins/subversion/subversionsettings.cpp index 7033d8c714..5a27512912 100644 --- a/src/plugins/subversion/subversionsettings.cpp +++ b/src/plugins/subversion/subversionsettings.cpp @@ -5,6 +5,7 @@ #include "subversionclient.h" #include "subversionplugin.h" +#include "subversiontr.h" #include <coreplugin/icore.h> #include <coreplugin/dialogs/ioptionspage.h> @@ -36,8 +37,8 @@ SubversionSettings::SubversionSettings() binaryPath.setExpectedKind(PathChooser::ExistingCommand); binaryPath.setHistoryCompleter("Subversion.Command.History"); binaryPath.setDefaultValue("svn" QTC_HOST_EXE_SUFFIX); - binaryPath.setDisplayName(tr("Subversion Command")); - binaryPath.setLabelText(tr("Subversion command:")); + binaryPath.setDisplayName(Tr::tr("Subversion Command")); + binaryPath.setLabelText(Tr::tr("Subversion command:")); registerAspect(&useAuthentication); useAuthentication.setSettingsKey("Authentication"); @@ -46,17 +47,17 @@ SubversionSettings::SubversionSettings() registerAspect(&userName); userName.setSettingsKey("User"); userName.setDisplayStyle(StringAspect::LineEditDisplay); - userName.setLabelText(tr("Username:")); + userName.setLabelText(Tr::tr("Username:")); registerAspect(&password); password.setSettingsKey("Password"); password.setDisplayStyle(StringAspect::LineEditDisplay); - password.setLabelText(tr("Password:")); + password.setLabelText(Tr::tr("Password:")); registerAspect(&spaceIgnorantAnnotation); spaceIgnorantAnnotation.setSettingsKey("SpaceIgnorantAnnotation"); spaceIgnorantAnnotation.setDefaultValue(true); - spaceIgnorantAnnotation.setLabelText(tr("Ignore whitespace changes in annotation")); + spaceIgnorantAnnotation.setLabelText(Tr::tr("Ignore whitespace changes in annotation")); registerAspect(&diffIgnoreWhiteSpace); diffIgnoreWhiteSpace.setSettingsKey("DiffIgnoreWhiteSpace"); @@ -66,11 +67,11 @@ SubversionSettings::SubversionSettings() registerAspect(&logCount); logCount.setDefaultValue(1000); - logCount.setLabelText(tr("Log count:")); + logCount.setLabelText(Tr::tr("Log count:")); registerAspect(&timeout); - timeout.setLabelText(tr("Timeout:")); - timeout.setSuffix(tr("s")); + timeout.setLabelText(Tr::tr("Timeout:")); + timeout.setSuffix(Tr::tr("s")); QObject::connect(&useAuthentication, &BaseAspect::changed, this, [this] { userName.setEnabled(useAuthentication.value()); @@ -86,7 +87,7 @@ bool SubversionSettings::hasAuthentication() const SubversionSettingsPage::SubversionSettingsPage(SubversionSettings *settings) { setId(VcsBase::Constants::VCS_ID_SUBVERSION); - setDisplayName(SubversionSettings::tr("Subversion")); + setDisplayName(Tr::tr("Subversion")); setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY); setSettings(settings); @@ -96,12 +97,12 @@ SubversionSettingsPage::SubversionSettingsPage(SubversionSettings *settings) Column { Group { - title(SubversionSettings::tr("Configuration")), + title(Tr::tr("Configuration")), Column { s.binaryPath } }, Group { - title(SubversionSettings::tr("Authentication"), &s.useAuthentication), + title(Tr::tr("Authentication"), &s.useAuthentication), Form { s.userName, s.password, @@ -109,7 +110,7 @@ SubversionSettingsPage::SubversionSettingsPage(SubversionSettings *settings) }, Group { - title(SubversionSettings::tr("Miscellaneous")), + title(Tr::tr("Miscellaneous")), Column { Row { s.logCount, s.timeout, st }, s.spaceIgnorantAnnotation, diff --git a/src/plugins/subversion/subversionsettings.h b/src/plugins/subversion/subversionsettings.h index ff74e44e28..01e3091695 100644 --- a/src/plugins/subversion/subversionsettings.h +++ b/src/plugins/subversion/subversionsettings.h @@ -11,8 +11,6 @@ namespace Internal { class SubversionSettings : public VcsBase::VcsBaseSettings { - Q_DECLARE_TR_FUNCTIONS(Subversion::Internal::SubversionSettings) - public: SubversionSettings(); diff --git a/src/plugins/subversion/subversionsubmiteditor.cpp b/src/plugins/subversion/subversionsubmiteditor.cpp index 47589c6680..b051076c4b 100644 --- a/src/plugins/subversion/subversionsubmiteditor.cpp +++ b/src/plugins/subversion/subversionsubmiteditor.cpp @@ -3,6 +3,7 @@ #include "subversionsubmiteditor.h" #include "subversionplugin.h" +#include "subversiontr.h" #include <coreplugin/idocument.h> #include <vcsbase/submiteditorwidget.h> @@ -13,7 +14,7 @@ using namespace Subversion::Internal; SubversionSubmitEditor::SubversionSubmitEditor() : VcsBase::VcsBaseSubmitEditor(new VcsBase::SubmitEditorWidget) { - document()->setPreferredDisplayName(tr("Subversion Submit")); + document()->setPreferredDisplayName(Tr::tr("Subversion Submit")); setDescriptionMandatory(false); } |