From 16ec7205371577c5f3667d87530ca7d236b430b9 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 19 Jan 2023 14:43:28 +0100 Subject: DiffEditor: Tr::tr Change-Id: I71b9908ea332256044120b42ff6af2fc57a89a5e Reviewed-by: hjk --- share/qtcreator/translations/qtcreator_cs.ts | 52 +--- share/qtcreator/translations/qtcreator_da.ts | 76 ------ share/qtcreator/translations/qtcreator_de.ts | 94 +------- share/qtcreator/translations/qtcreator_fr.ts | 13 +- share/qtcreator/translations/qtcreator_hr.ts | 78 +----- share/qtcreator/translations/qtcreator_ja.ts | 118 +-------- share/qtcreator/translations/qtcreator_pl.ts | 73 +----- share/qtcreator/translations/qtcreator_ru.ts | 76 ------ share/qtcreator/translations/qtcreator_uk.ts | 263 +-------------------- share/qtcreator/translations/qtcreator_zh_CN.ts | 96 -------- src/plugins/diffeditor/diffeditor.cpp | 21 +- src/plugins/diffeditor/diffeditordocument.cpp | 5 +- src/plugins/diffeditor/diffeditorplugin.cpp | 43 ++-- .../diffeditor/diffeditorwidgetcontroller.cpp | 11 +- src/plugins/diffeditor/diffview.cpp | 24 +- .../diffeditor/sidebysidediffeditorwidget.cpp | 17 +- src/plugins/diffeditor/unifieddiffeditorwidget.cpp | 11 +- 17 files changed, 86 insertions(+), 985 deletions(-) diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts index 22178204de..b77d9fed4a 100644 --- a/share/qtcreator/translations/qtcreator_cs.ts +++ b/share/qtcreator/translations/qtcreator_cs.ts @@ -50621,16 +50621,10 @@ nelze najít v cestě. Diff Editor Editor rozdílů - - - DiffEditor::Internal::DiffEditorEditable Ignore Whitespaces Nevšímat si prázdných míst - - - DiffEditor::Internal::DiffEditorPlugin Diff... Rozdíly... @@ -50648,9 +50642,6 @@ nelze najít v cestě. Editor title Rozdíly u "%1", "%2" - - - DiffEditor::DiffViewEditorWidget No difference Žádný rozdíl @@ -52933,7 +52924,7 @@ Lze používat části jmen, pokud jsou jednoznačné. - DiffEditor::DiffEditor + ::DiffEditor Ignore Whitespace Nevšímat si bílých znaků @@ -54853,15 +54844,7 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr - DiffEditor::DiffShowEditor - - Hide Change Description - Skrýt popis změny - - - Show Change Description - Ukázat popis změny - + ::DiffEditor ::Git @@ -56755,44 +56738,15 @@ Vytvořte, prosím, aplikaci qmldump na stránce pro nastavení verze Qt. - DiffEditor::DiffEditorController - - No difference - Žádný rozdíl - - - - DiffEditor::DiffEditorManager + ::DiffEditor Waiting for data... Čeká se na data... - - - DiffEditor::SideDiffEditorWidget - - Skipped %n lines... - - Přeskočen %n řádek... - Přeskočeny %n řádky... - Přeskočeno %n řádků... - - - - [%1] %2 - [%1] %2 - - - - DiffEditor::SideBySideDiffEditorWidget No controller Žádný ovladač - - No difference - Žádný rozdíl - ::ProjectExplorer diff --git a/share/qtcreator/translations/qtcreator_da.ts b/share/qtcreator/translations/qtcreator_da.ts index e6d794eeb1..8c0daeffdd 100644 --- a/share/qtcreator/translations/qtcreator_da.ts +++ b/share/qtcreator/translations/qtcreator_da.ts @@ -13963,9 +13963,6 @@ Det hjælper måske at genbygge projektet. Diff Editor Diff-redigering - - - DiffEditor::Internal::DiffCurrentFileController Saved Gemt @@ -13974,9 +13971,6 @@ Det hjælper måske at genbygge projektet. Modified Ændret - - - DiffEditor::Internal::DiffEditor Context lines: Kontekst linjer: @@ -14009,16 +14003,10 @@ Det hjælper måske at genbygge projektet. Show Change Description Vis ændringsbeskrivelse - - - DiffEditor::Internal::DiffEditorDocument Could not parse patch file "%1". The content is not of unified diff format. Kunne ikke parse patch-filen "%1". Indholdet er ikke unified diff-format. - - - DiffEditor::Internal::DiffEditorPlugin &Diff &Diff @@ -14067,9 +14055,6 @@ Det hjælper måske at genbygge projektet. Diff "%1", "%2" Diff "%1", "%2" - - - DiffEditor::Internal::DiffEditorServiceImpl Diff Files Diff filer @@ -14078,9 +14063,6 @@ Det hjælper måske at genbygge projektet. Diff Modified Files Diff ændrede filer - - - DiffEditor::Internal::DiffEditorWidgetController Revert Chunk Tilbagefør bid @@ -14109,38 +14091,10 @@ Det hjælper måske at genbygge projektet. Revert Chunk... Tilbagefør bid... - - - DiffEditor::Internal::DiffFilesController Calculating diff Udregninger diff - - - DiffEditor::Internal::DiffModifiedFilesController - - Saved - Gemt - - - Modified - Ændret - - - - DiffEditor::Internal::DiffOpenFilesController - - Saved - Gemt - - - Modified - Ændret - - - - DiffEditor::Internal::SideBySideDiffEditorWidget Skipped %n lines... @@ -14160,9 +14114,6 @@ Det hjælper måske at genbygge projektet. No difference. Ingen forskel. - - - DiffEditor::Internal::SideBySideView Synchronize Horizontal Scroll Bars Synkroniser vandrette rullebjælker @@ -14175,45 +14126,18 @@ Det hjælper måske at genbygge projektet. Retrieving data failed. Kunne ikke hente data. - - - DiffEditor::Internal::SideDiffEditorWidget [%1] %2 [%1] %2 - - - DiffEditor::Internal::UnifiedDiffEditorWidget No document Intet dokument - - No difference. - Ingen forskel. - - - - DiffEditor::Internal::UnifiedView - - Waiting for data... - Venter på data... - - - Retrieving data failed. - Kunne ikke hente data. - - - - DiffEditor::SideBySideView Switch to Side By Side Diff Editor Skift til side-om-side diff-redigering - - - DiffEditor::UnifiedView Switch to Unified Diff Editor Skift til unified diff-redigering diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index aa6a7169fb..808dc2551d 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -27719,9 +27719,6 @@ The affected files are: Diff Editor Diff-Editor - - - DiffEditor::Internal::DiffEditorPlugin &Diff &Diff @@ -34696,7 +34693,7 @@ provided they were unmodified before the refactoring. - DiffEditor::Internal::DiffEditor + ::DiffEditor Context lines: Kontextzeilen: @@ -34729,23 +34726,14 @@ provided they were unmodified before the refactoring. Show Change Description Beschreibung der Änderung einblenden - - - DiffEditor::Internal::DiffEditorDocument Could not parse patch file "%1". The content is not of unified diff format. Die Patch-Datei "%1" konnte nicht ausgewertet werden. Der Inhalt ist nicht im vereinheitlichten Format. - - - DiffEditor::UnifiedView Switch to Unified Diff Editor Unterschiede im vereinheitlichten Format anzeigen - - - DiffEditor::Internal::UnifiedView Waiting for data... Warte auf Daten... @@ -34754,31 +34742,14 @@ provided they were unmodified before the refactoring. Retrieving data failed. Es konnten keine Daten empfangen werden. - - - DiffEditor::SideBySideView Switch to Side By Side Diff Editor Unterschiede nebeneinander anzeigen - - - DiffEditor::Internal::SideBySideView Synchronize Horizontal Scroll Bars Horizontale Bildlaufleisten synchronisieren - - Waiting for data... - Warte auf Daten... - - - Retrieving data failed. - Es konnten keine Daten empfangen werden. - - - - DiffEditor::Internal::SideBySideDiffEditorWidget Skipped %n lines... @@ -34794,52 +34765,22 @@ provided they were unmodified before the refactoring. Skipped unknown number of lines... Unbekannte Anzahl von Zeilen übersprungen... - - Waiting for data... - Warte auf Daten... - No difference. Kein Unterschied. - - Retrieving data failed. - Es konnten keine Daten empfangen werden. - Rendering diff - - - DiffEditor::Internal::SideDiffEditorWidget [%1] %2 [%1] %2 - - - DiffEditor::Internal::UnifiedDiffEditorWidget No document Kein Dokument - - Waiting for data... - Warte auf Daten... - - - No difference. - Kein Unterschied. - - - Retrieving data failed. - Es konnten keine Daten empfangen werden. - - - Rendering diff - - ModelEditor::Internal::ActionHandler @@ -39662,14 +39603,11 @@ Zeile: %4, Spalte: %5 - DiffEditor::Internal::DiffFilesController + ::DiffEditor Calculating diff Bestimme Unterschiede - - - DiffEditor::Internal::DiffCurrentFileController Saved Gespeichert @@ -39678,31 +39616,6 @@ Zeile: %4, Spalte: %5 Modified Geändert - - - DiffEditor::Internal::DiffOpenFilesController - - Saved - Gespeichert - - - Modified - Geändert - - - - DiffEditor::Internal::DiffModifiedFilesController - - Saved - Gespeichert - - - Modified - Geändert - - - - DiffEditor::Internal::DiffEditorServiceImpl Diff Files Unterschiede zwischen Dateien anzeigen @@ -39711,9 +39624,6 @@ Zeile: %4, Spalte: %5 Diff Modified Files Unterschiede zwischen geänderten Dateien anzeigen - - - DiffEditor::Internal::DiffEditorWidgetController Send Chunk to CodePaster... Änderung an CodePaster senden... diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts index 393126d4f2..a3dcfbce30 100644 --- a/share/qtcreator/translations/qtcreator_fr.ts +++ b/share/qtcreator/translations/qtcreator_fr.ts @@ -48660,7 +48660,7 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües. - DiffEditor::DiffEditor + ::DiffEditor Ignore Whitespace Ignorer les espaces @@ -48685,16 +48685,10 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.[%1] %2 vs. [%3] %4 [%1] %2 contre [%3] %4 - - - ::DiffEditor Diff Editor Éditeur de différences - - - DiffEditor::Internal::DiffEditorPlugin Diff... Diff... @@ -48712,9 +48706,6 @@ Les noms partiels peuvent êtres utilisé s'ils ne sont pas ambigües.Editor title Diff "%1", "%2" - - - DiffEditor::DiffViewEditorWidget No difference Aucune différence @@ -51615,7 +51606,7 @@ réinitialisation du moniteur - DiffEditor::DiffShowEditor + ::DiffEditor Hide Change Description Masquer la description des changements diff --git a/share/qtcreator/translations/qtcreator_hr.ts b/share/qtcreator/translations/qtcreator_hr.ts index c1660000aa..9d8d1265fe 100644 --- a/share/qtcreator/translations/qtcreator_hr.ts +++ b/share/qtcreator/translations/qtcreator_hr.ts @@ -22428,7 +22428,7 @@ Možda će ponovna gradnja projekta pomoći. - DiffEditor::Internal::DiffEditor + ::DiffEditor Context lines: Retci konteksta: @@ -22461,30 +22461,18 @@ Možda će ponovna gradnja projekta pomoći. Show Change Description Prikaži opis promjena - - - ::DiffEditor Diff Editor Uređivač za razlike - - - DiffEditor::Internal::DiffEditorDocument Could not parse patch file "%1". The content is not of unified diff format. - - - DiffEditor::Internal::DiffFilesController Calculating diff Izračunavanje razlika - - - DiffEditor::Internal::DiffCurrentFileController Saved Spremljeno @@ -22493,31 +22481,6 @@ Možda će ponovna gradnja projekta pomoći. Modified Promijenjeno - - - DiffEditor::Internal::DiffOpenFilesController - - Saved - Spremljeno - - - Modified - Promijenjeno - - - - DiffEditor::Internal::DiffModifiedFilesController - - Saved - Spremljeno - - - Modified - Promijenjeno - - - - DiffEditor::Internal::DiffEditorServiceImpl Diff Files Datoteke razlika @@ -22526,9 +22489,6 @@ Možda će ponovna gradnja projekta pomoći. Diff Modified Files Datoteke razlika promjena - - - DiffEditor::Internal::DiffEditorPlugin &Diff &Razlike @@ -22577,9 +22537,6 @@ Možda će ponovna gradnja projekta pomoći. Diff "%1", "%2" Razlike "%1", "%2" - - - DiffEditor::Internal::DiffEditorWidgetController Revert Chunk Vrati komad @@ -22608,16 +22565,10 @@ Možda će ponovna gradnja projekta pomoći. Revert Chunk... Vrati komad … - - - DiffEditor::UnifiedView Switch to Unified Diff Editor Prebaci na uređivač za ujedinjene razlike - - - DiffEditor::Internal::UnifiedView Waiting for data... Čekanje na podatke … @@ -22626,31 +22577,14 @@ Možda će ponovna gradnja projekta pomoći. Retrieving data failed. Neuspjelo dohvaćanje podataka. - - - DiffEditor::SideBySideView Switch to Side By Side Diff Editor Prebaci uređivača na usporedni prikaz razlika - - - DiffEditor::Internal::SideBySideView Synchronize Horizontal Scroll Bars Sinkroniziraj vodoravne klizne trake - - Waiting for data... - Čekanje na podatke … - - - Retrieving data failed. - Neuspjelo dohvaćanje podataka. - - - - DiffEditor::Internal::SideBySideDiffEditorWidget Skipped %n lines... @@ -22671,24 +22605,14 @@ Možda će ponovna gradnja projekta pomoći. No difference. Nema razlike. - - - DiffEditor::Internal::SideDiffEditorWidget [%1] %2 [%1] %2 - - - DiffEditor::Internal::UnifiedDiffEditorWidget No document Nema dokumenta - - No difference. - Nema razlike. - EmacsKeys::Internal::EmacsKeysPlugin diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts index aef4a159dd..314c6a09c6 100644 --- a/share/qtcreator/translations/qtcreator_ja.ts +++ b/share/qtcreator/translations/qtcreator_ja.ts @@ -19408,9 +19408,6 @@ Rebuilding the project might help. Diff Editor 差分エディタ - - - DiffEditor::Internal::DiffEditorPlugin Diff... 差分... @@ -32591,7 +32588,7 @@ kill しますか？ - DiffEditor::DiffEditorController + ::DiffEditor and %n more Displayed after the untranslated message "Branches: branch1, branch2 'and %n more'" @@ -39115,7 +39112,7 @@ Preselects a desktop Qt for building the application if available. - DiffEditor::Internal::DiffEditor + ::DiffEditor Context lines: コンテキスト行: @@ -39148,23 +39145,14 @@ Preselects a desktop Qt for building the application if available. Show Change Description 差分の記述を表示する - - - DiffEditor::Internal::DiffEditorDocument Could not parse patch file "%1". The content is not of unified diff format. パッチファイル "%1" を解析できませんでした。コンテンツがユニファイド diff 形式ではありません。 - - - DiffEditor::UnifiedView Switch to Unified Diff Editor ユニファイド形式の差分エディタに切り替える - - - DiffEditor::Internal::UnifiedView Waiting for data... データ待機中... @@ -39173,31 +39161,14 @@ Preselects a desktop Qt for building the application if available. Failed 失敗 - - - DiffEditor::SideBySideView Switch to Side By Side Diff Editor サイドバイサイドの差分エディタに切り替える - - - DiffEditor::Internal::SideBySideView Synchronize Horizontal Scroll Bars 水平スクロールバーを同期する - - Waiting for data... - データ待機中... - - - Failed - 失敗 - - - - DiffEditor::Internal::SideBySideDiffEditorWidget Skipped %n lines... @@ -39248,52 +39219,14 @@ Preselects a desktop Qt for building the application if available. Would you like to apply the chunk? チャンクを適用しますか？ - - - DiffEditor::Internal::SideDiffEditorWidget [%1] %2 [%1] %2 - - - DiffEditor::Internal::UnifiedDiffEditorWidget No document ドキュメントなし - - Send Chunk to CodePaster... - CodePaster にチャンクを送る... - - - Apply Chunk... - チャンクの適用... - - - Revert Chunk... - チャンクを元に戻す... - - - Revert Chunk - チャンクを元に戻す - - - Apply Chunk - チャンクの適用 - - - Would you like to revert the chunk? - チャンクを元に戻しますか？ - - - Would you like to apply the chunk? - チャンクを適用しますか？ - - - No difference. - 差分がありません。 - ::FakeVim @@ -45981,56 +45914,11 @@ Stepping into the module or setting breakpoints by file and line is expected to - DiffEditor::Internal::DiffCurrentFileController - - Modified - 変更 - - - - DiffEditor::Internal::DiffOpenFilesController - - Modified - 変更 - - - - DiffEditor::Internal::DiffModifiedFilesController + ::DiffEditor Modified 変更 - - - DiffEditor::Internal::DiffEditorWidgetController - - Revert Chunk - チャンクを元に戻す - - - Apply Chunk - チャンクの適用 - - - Would you like to revert the chunk? - チャンクを元に戻しますか？ - - - Would you like to apply the chunk? - チャンクを適用しますか？ - - - Send Chunk to CodePaster... - CodePaster にチャンクを送る... - - - Apply Chunk... - チャンクの適用... - - - Revert Chunk... - チャンクを元に戻す... - Select Encoding 文字コードの選択 diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts index 2a4689ab9d..445db668cd 100644 --- a/share/qtcreator/translations/qtcreator_pl.ts +++ b/share/qtcreator/translations/qtcreator_pl.ts @@ -24257,9 +24257,6 @@ Więcej informacji w dokumentacji "Checking Code Syntax".Diff Editor Edytor różnic - - - DiffEditor::Internal::DiffEditorPlugin &Diff Po&równaj @@ -32637,7 +32634,7 @@ Ustawianie pułapek w liniach plików może się nie udać. - DiffEditor::Internal::DiffEditor + ::DiffEditor Context lines: Linie z kontekstem: @@ -32670,23 +32667,14 @@ Ustawianie pułapek w liniach plików może się nie udać. Show Change Description Pokaż opis zmiany - - - DiffEditor::Internal::DiffEditorDocument Could not parse patch file "%1". The content is not of unified diff format. Nie można sparsować pliku z łatami "%1". Zawartość nie jest w formacie ujednoliconym (unified diff). - - - DiffEditor::UnifiedView Switch to Unified Diff Editor Przełącz do edytora różnic wyświetlającego zawartość w formacie ujednoliconym (unified diff) - - - DiffEditor::Internal::UnifiedView Waiting for data... Oczekiwanie na dane... @@ -32695,31 +32683,14 @@ Ustawianie pułapek w liniach plików może się nie udać. Retrieving data failed. Błąd pobierania danych. - - - DiffEditor::SideBySideView Switch to Side By Side Diff Editor Przełącz do edytora różnic wyświetlającego zawartość sąsiadująco - - - DiffEditor::Internal::SideBySideView Synchronize Horizontal Scroll Bars Synchronizuj poziome paski przesuwania - - Waiting for data... - Oczekiwanie na dane... - - - Retrieving data failed. - Błąd pobierania danych. - - - - DiffEditor::Internal::SideBySideDiffEditorWidget Skipped %n lines... @@ -32740,24 +32711,14 @@ Ustawianie pułapek w liniach plików może się nie udać. No difference. Brak różnic. - - - DiffEditor::Internal::SideDiffEditorWidget [%1] %2 [%1] %2 - - - DiffEditor::Internal::UnifiedDiffEditorWidget No document Brak dokumentu - - No difference. - Brak różnic. - ::ImageViewer @@ -38016,29 +37977,7 @@ Wskakiwanie do wnętrza modułu lub ustawianie pułapek w plikach powinno dział - DiffEditor::Internal::DiffCurrentFileController - - Saved - Zachowany - - - Modified - Zmodyfikowany - - - - DiffEditor::Internal::DiffOpenFilesController - - Saved - Zachowany - - - Modified - Zmodyfikowany - - - - DiffEditor::Internal::DiffModifiedFilesController + ::DiffEditor Saved Zachowany @@ -38047,9 +37986,6 @@ Wskakiwanie do wnętrza modułu lub ustawianie pułapek w plikach powinno dział Modified Zmodyfikowany - - - DiffEditor::Internal::DiffEditorServiceImpl Diff Files Pokaż różnice w plikach @@ -38058,9 +37994,6 @@ Wskakiwanie do wnętrza modułu lub ustawianie pułapek w plikach powinno dział Diff Modified Files Pokaż różnice w zmodyfikowanych plikach - - - DiffEditor::Internal::DiffEditorWidgetController Revert Chunk Odwróć zmiany we fragmencie @@ -39748,7 +39681,7 @@ Błąd: %2 - DiffEditor::Internal::DiffFilesController + ::DiffEditor Calculating diff Sporządzanie różnic diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index 80a3db030e..8d9552c72f 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -17646,9 +17646,6 @@ Rebuilding the project might help. Diff Editor Редактор изменений - - - DiffEditor::Internal::DiffCurrentFileController Saved Сохранён @@ -17657,9 +17654,6 @@ Rebuilding the project might help. Modified Изменён - - - DiffEditor::Internal::DiffEditor Ignore Whitespace Игнорировать пробелы @@ -17692,16 +17686,10 @@ Rebuilding the project might help. Show Change Description Показать описание изменения - - - DiffEditor::Internal::DiffEditorDocument Could not parse patch file "%1". The content is not of unified diff format. Не удалось разобрать файл изменений «%1». Содержимое не в формате «унифицированный diff». - - - DiffEditor::Internal::DiffEditorPlugin &Diff &Сравнить @@ -17750,9 +17738,6 @@ Rebuilding the project might help. Diff "%1", "%2" Сравнение «%1» с «%2» - - - DiffEditor::Internal::DiffEditorServiceImpl Diff Files Отличия файлов @@ -17761,9 +17746,6 @@ Rebuilding the project might help. Diff Modified Files Отличия изменённых файлов - - - DiffEditor::Internal::DiffEditorWidgetController Revert Chunk Откат фрагмента @@ -17800,38 +17782,10 @@ Rebuilding the project might help. Select Encoding Выбрать кодировку - - - DiffEditor::Internal::DiffFilesController Calculating diff Вычисление отличий - - - DiffEditor::Internal::DiffModifiedFilesController - - Saved - Сохранён - - - Modified - Изменён - - - - DiffEditor::Internal::DiffOpenFilesController - - Saved - Сохранён - - - Modified - Изменён - - - - DiffEditor::Internal::SideBySideDiffEditorWidget Skipped %n lines... @@ -17852,9 +17806,6 @@ Rebuilding the project might help. No difference. Различий нет. - - - DiffEditor::Internal::SideBySideView Synchronize Horizontal Scroll Bars Согласовать горизонтальные полосы прокрутки @@ -17867,45 +17818,18 @@ Rebuilding the project might help. Retrieving data failed. Не удалось получить данные. - - - DiffEditor::Internal::SideDiffEditorWidget [%1] %2 [%1] %2 - - - DiffEditor::Internal::UnifiedDiffEditorWidget No document Нет документа - - No difference. - Различий нет. - - - - DiffEditor::Internal::UnifiedView - - Waiting for data... - Ожидание данных... - - - Retrieving data failed. - Не удалось получить данные. - - - - DiffEditor::SideBySideView Switch to Side By Side Diff Editor Переключиться в двусторонний редактор отличий - - - DiffEditor::UnifiedView Switch to Unified Diff Editor Переключиться в унифицированный редактор отличий diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts index 3929cd8873..08b98620a6 100644 --- a/share/qtcreator/translations/qtcreator_uk.ts +++ b/share/qtcreator/translations/qtcreator_uk.ts @@ -30430,9 +30430,6 @@ cannot be found in the path. Diff Editor Редактор різниць - - - DiffEditor::Internal::DiffEditorPlugin Diff... Порівняти... @@ -30450,21 +30447,6 @@ cannot be found in the path. Порівняння "%1" з "%2" - - DiffEditor::DiffViewEditorWidget - - Skipped %n lines... - - Пропущено %n рядок... - Пропущено %n рядки... - Пропущено %n рядків... - - - - [%1] %2 - [%1] %2 - - ::Git @@ -32753,11 +32735,7 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d - DiffEditor::DiffEditor - - Ignore Whitespace - Ігнорувати пропуски - + ::DiffEditor Context Lines: Контекстні рядки: @@ -32766,30 +32744,6 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d Reload Editor Перезавантажити редактор - - Synchronize Horizontal Scroll Bars - Синхронізувати горизонтальні смуги прокрутки - - - [%1] vs. [%2] %3 - [%1] vs. [%2] %3 - - - %1 vs. %2 - %1 vs. %2 - - - [%1] %2 vs. [%3] %4 - [%1] %2 vs. [%3] %4 - - - Hide Change Description - Сховати опис зміни - - - Show Change Description - Показати опис зміни - ::ProjectExplorer @@ -36203,11 +36157,7 @@ Do you want to kill it? - DiffEditor::DiffEditorController - - No difference - Немає відмінностей - + ::DiffEditor and %n more Displayed after the untranslated message "Branches: branch1, branch2 'and %n more'" @@ -36222,91 +36172,6 @@ Do you want to kill it? <Немає> - - DiffEditor::DiffEditorManager - - Waiting for data... - Очікування на дані... - - - - DiffEditor::SideDiffEditorWidget - - Skipped %n lines... - - Пропущено %n рядок... - Пропущено %n рядки... - Пропущено %n рядків... - - - - [%1] %2 - [%1] %2 - - - - DiffEditor::SideBySideDiffEditorWidget - - Skipped %n lines... - - Пропущено %n рядок... - Пропущено %n рядки... - Пропущено %n рядків... - - - - Binary files differ - Двійкові файли відрізняються - - - Skipped unknown number of lines... - Пропущено невідому кількість рядків... - - - No controller - Відсутній контролер - - - No difference - Немає відмінностей - - - Send Chunk to CodePaster... - Надіслати шматочок до Codepaster... - - - Apply Chunk... - Накласти частину латки... - - - Revert Chunk... - Зняти частину латки... - - - Unable to Paste - Неможливо вставити - - - Code pasting services are not available. - Служби вставки коду не доступні. - - - Revert Chunk - Зняття частини латки - - - Apply Chunk - Накладання частини латки - - - Would you like to revert the chunk? - Бажаєте зняти частину латки? - - - Would you like to apply the chunk? - Бажаєте накласти частину латки? - - ::Ios @@ -37363,51 +37228,7 @@ Install an SDK of at least API version %1. - DiffEditor::UnifiedDiffEditorWidget - - No controller - Відсутній контролер - - - Send Chunk to CodePaster... - Надіслати шматочок до Codepaster... - - - Apply Chunk... - Накласти частину латки... - - - Revert Chunk... - Зняти частину латки... - - - Unable to Paste - Неможливо вставити - - - Code pasting services are not available. - Служби вставки коду не доступні. - - - Revert Chunk - Зняття частини латки - - - Apply Chunk - Накладання частини латки - - - Would you like to revert the chunk? - Бажаєте зняти частину латки? - - - Would you like to apply the chunk? - Бажаєте накласти частину латки? - - - No difference - Немає відмінностей - + ::DiffEditor EmacsKeys::Internal::EmacsKeysPlugin @@ -41723,7 +41544,7 @@ Setting breakpoints by file name and line number may fail. - DiffEditor::Internal::DiffEditor + ::DiffEditor Context lines: Контекстні рядки: @@ -41756,23 +41577,14 @@ Setting breakpoints by file name and line number may fail. Show Change Description Показати опис зміни - - - DiffEditor::Internal::DiffEditorDocument Could not parse patch file "%1". The content is not of unified diff format. Не вдалось розібрати файл латки "%1". Зміст не в форматі "уніфікований diff". - - - DiffEditor::UnifiedView Switch to Unified Diff Editor - - - DiffEditor::Internal::UnifiedView Waiting for data... Очікування на дані... @@ -41781,31 +41593,14 @@ Setting breakpoints by file name and line number may fail. Failed Збій - - - DiffEditor::SideBySideView Switch to Side By Side Diff Editor - - - DiffEditor::Internal::SideBySideView Synchronize Horizontal Scroll Bars Синхронізувати горизонтальні смуги прокрутки - - Waiting for data... - Очікування на дані... - - - Failed - Збій - - - - DiffEditor::Internal::SideBySideDiffEditorWidget Skipped %n lines... @@ -41838,14 +41633,6 @@ Setting breakpoints by file name and line number may fail. Revert Chunk... Зняти частину латки... - - Unable to Paste - Неможливо вставити - - - Code pasting services are not available. - Служби вставки коду не доступні. - Revert Chunk Зняття частини латки @@ -41862,56 +41649,14 @@ Setting breakpoints by file name and line number may fail. Would you like to apply the chunk? Бажаєте накласти частину латки? - - - DiffEditor::Internal::SideDiffEditorWidget [%1] %2 [%1] %2 - - - DiffEditor::Internal::UnifiedDiffEditorWidget No document Немає документа - - Send Chunk to CodePaster... - Надіслати шматочок до Codepaster... - - - Apply Chunk... - Накласти частину латки... - - - Revert Chunk... - Зняти частину латки... - - - Unable to Paste - Неможливо вставити - - - Code pasting services are not available. - Служби вставки коду не доступні. - - - Revert Chunk - Зняття частини латки - - - Apply Chunk - Накладання частини латки - - - Would you like to revert the chunk? - Бажаєте зняти частину латки? - - - Would you like to apply the chunk? - Бажаєте накласти частину латки? - No difference. Немає відмінностей. diff --git a/share/qtcreator/translations/qtcreator_zh_CN.ts b/share/qtcreator/translations/qtcreator_zh_CN.ts index b61df2459c..7463245e54 100644 --- a/share/qtcreator/translations/qtcreator_zh_CN.ts +++ b/share/qtcreator/translations/qtcreator_zh_CN.ts @@ -18047,9 +18047,6 @@ Rebuilding the project might help. Diff Editor - - - DiffEditor::Internal::DiffCurrentFileController Saved @@ -18058,9 +18055,6 @@ Rebuilding the project might help. Modified 已更改 - - - DiffEditor::Internal::DiffEditor Context lines: @@ -18093,16 +18087,10 @@ Rebuilding the project might help. Show Change Description - - - DiffEditor::Internal::DiffEditorDocument Could not parse patch file "%1". The content is not of unified diff format. - - - DiffEditor::Internal::DiffEditorPlugin &Diff &Diff @@ -18151,9 +18139,6 @@ Rebuilding the project might help. Diff "%1", "%2" - - - DiffEditor::Internal::DiffEditorServiceImpl Diff Files @@ -18162,9 +18147,6 @@ Rebuilding the project might help. Diff Modified Files - - - DiffEditor::Internal::DiffEditorWidgetController Send Chunk to CodePaster... @@ -18185,38 +18167,10 @@ Rebuilding the project might help. Select Encoding 选择编码 - - - DiffEditor::Internal::DiffFilesController Calculating diff - - - DiffEditor::Internal::DiffModifiedFilesController - - Saved - - - - Modified - 已更改 - - - - DiffEditor::Internal::DiffOpenFilesController - - Saved - - - - Modified - 已更改 - - - - DiffEditor::Internal::SideBySideDiffEditorWidget Skipped %n lines... @@ -18247,72 +18201,22 @@ Rebuilding the project might help. Rendering diff - - - DiffEditor::Internal::SideBySideView Synchronize Horizontal Scroll Bars - - Waiting for data... - 等待数据... - - - Retrieving data failed. - - - - - DiffEditor::Internal::SideDiffEditorWidget [%1] %2 - - - DiffEditor::Internal::UnifiedDiffEditorWidget No document - - Waiting for data... - 等待数据... - - - No difference. - - - - Retrieving data failed. - - - - Rendering diff - - - - - DiffEditor::Internal::UnifiedView - - Waiting for data... - 等待数据... - - - Retrieving data failed. - - - - - DiffEditor::SideBySideView Switch to Side By Side Diff Editor - - - DiffEditor::UnifiedView Switch to Unified Diff Editor diff --git a/src/plugins/diffeditor/diffeditor.cpp b/src/plugins/diffeditor/diffeditor.cpp index 9819bf6d69..5274214f92 100644 --- a/src/plugins/diffeditor/diffeditor.cpp +++ b/src/plugins/diffeditor/diffeditor.cpp @@ -5,6 +5,7 @@ #include "diffeditorconstants.h" #include "diffeditordocument.h" #include "diffeditoricons.h" +#include "diffeditortr.h" #include "diffview.h" #include @@ -188,7 +189,7 @@ DiffEditor::DiffEditor() m_toolBar->addWidget(m_entriesComboBox); QLabel *contextLabel = new QLabel(m_toolBar); - contextLabel->setText(tr("Context lines:")); + contextLabel->setText(Tr::tr("Context lines:")); contextLabel->setContentsMargins(6, 0, 6, 0); m_contextLabelAction = m_toolBar->addWidget(contextLabel); @@ -198,14 +199,14 @@ DiffEditor::DiffEditor() m_contextSpinBox->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Expanding); // Mac Qt5 m_contextSpinBoxAction = m_toolBar->addWidget(m_contextSpinBox); - m_whitespaceButtonAction = m_toolBar->addAction(tr("Ignore Whitespace")); + m_whitespaceButtonAction = m_toolBar->addAction(Tr::tr("Ignore Whitespace")); m_whitespaceButtonAction->setCheckable(true); m_toggleDescriptionAction = m_toolBar->addAction(Icons::TOP_BAR.icon(), {}); m_toggleDescriptionAction->setCheckable(true); - m_reloadAction = m_toolBar->addAction(Utils::Icons::RELOAD_TOOLBAR.icon(), tr("Reload Diff")); - m_reloadAction->setToolTip(tr("Reload Diff")); + m_reloadAction = m_toolBar->addAction(Utils::Icons::RELOAD_TOOLBAR.icon(), Tr::tr("Reload Diff")); + m_reloadAction->setToolTip(Tr::tr("Reload Diff")); m_toggleSyncAction = m_toolBar->addAction(Utils::Icons::LINK_TOOLBAR.icon(), {}); m_toggleSyncAction->setCheckable(true); @@ -331,7 +332,7 @@ void DiffEditor::documentHasChanged() if (leftEntry.typeInfo.isEmpty() && rightEntry.typeInfo.isEmpty()) { itemToolTip = leftEntry.fileName; } else { - itemToolTip = tr("[%1] vs. [%2] %3") + itemToolTip = Tr::tr("[%1] vs. [%2] %3") .arg(leftEntry.typeInfo, rightEntry.typeInfo, leftEntry.fileName); @@ -340,17 +341,17 @@ void DiffEditor::documentHasChanged() if (leftShortFileName == rightShortFileName) { itemText = leftShortFileName; } else { - itemText = tr("%1 vs. %2") + itemText = Tr::tr("%1 vs. %2") .arg(leftShortFileName, rightShortFileName); } if (leftEntry.typeInfo.isEmpty() && rightEntry.typeInfo.isEmpty()) { - itemToolTip = tr("%1 vs. %2") + itemToolTip = Tr::tr("%1 vs. %2") .arg(leftEntry.fileName, rightEntry.fileName); } else { - itemToolTip = tr("[%1] %2 vs. [%3] %4") + itemToolTip = Tr::tr("[%1] %2 vs. [%3] %4") .arg(leftEntry.typeInfo, leftEntry.fileName, rightEntry.typeInfo, @@ -385,8 +386,8 @@ void DiffEditor::updateDescription() m_descriptionWidget->setPlainText(description); m_descriptionWidget->setVisible(m_showDescription && !description.isEmpty()); - const QString actionText = m_showDescription ? tr("Hide Change Description") - : tr("Show Change Description"); + const QString actionText = m_showDescription ? Tr::tr("Hide Change Description") + : Tr::tr("Show Change Description"); GuardLocker guard(m_ignoreChanges); m_toggleDescriptionAction->setChecked(m_showDescription); m_toggleDescriptionAction->setToolTip(actionText); diff --git a/src/plugins/diffeditor/diffeditordocument.cpp b/src/plugins/diffeditor/diffeditordocument.cpp index 505501af17..66c5aa2450 100644 --- a/src/plugins/diffeditor/diffeditordocument.cpp +++ b/src/plugins/diffeditor/diffeditordocument.cpp @@ -4,6 +4,7 @@ #include "diffeditordocument.h" #include "diffeditorconstants.h" #include "diffeditorcontroller.h" +#include "diffeditortr.h" #include #include @@ -292,8 +293,8 @@ Core::IDocument::OpenResult DiffEditorDocument::open(QString *errorString, const bool ok = false; QList fileDataList = DiffUtils::readPatch(patch, &ok); if (!ok) { - *errorString = tr("Could not parse patch file \"%1\". " - "The content is not of unified diff format.") + *errorString = Tr::tr("Could not parse patch file \"%1\". " + "The content is not of unified diff format.") .arg(filePath.toUserOutput()); } else { setTemporary(false); diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index 830db67151..44c824c3de 100644 --- a/src/plugins/diffeditor/diffeditorplugin.cpp +++ b/src/plugins/diffeditor/diffeditorplugin.cpp @@ -6,6 +6,7 @@ #include "diffeditorcontroller.h" #include "diffeditordocument.h" #include "diffeditorfactory.h" +#include "diffeditortr.h" #include #include @@ -105,7 +106,7 @@ protected: DiffFilesController::DiffFilesController(IDocument *document) : DiffEditorController(document) { - setDisplayName(tr("Diff")); + setDisplayName(Tr::tr("Diff")); using namespace Tasking; const TreeStorage> storage; @@ -182,8 +183,8 @@ QList DiffCurrentFileController::reloadInputList() const ReloadInput reloadInput; reloadInput.text = {leftText, rightText}; - reloadInput.fileInfo = {DiffFileInfo(m_fileName, tr("Saved")), - DiffFileInfo(m_fileName, tr("Modified"))}; + reloadInput.fileInfo = {DiffFileInfo(m_fileName, Tr::tr("Saved")), + DiffFileInfo(m_fileName, Tr::tr("Modified"))}; reloadInput.fileInfo[RightSide].patchBehaviour = DiffFileInfo::PatchEditor; reloadInput.binaryFiles = (leftResult == TextFileFormat::ReadEncodingError); @@ -231,8 +232,8 @@ QList DiffOpenFilesController::reloadInputList() const ReloadInput reloadInput; reloadInput.text = {leftText, rightText}; - reloadInput.fileInfo = {DiffFileInfo(fileName, tr("Saved")), - DiffFileInfo(fileName, tr("Modified"))}; + reloadInput.fileInfo = {DiffFileInfo(fileName, Tr::tr("Saved")), + DiffFileInfo(fileName, Tr::tr("Modified"))}; reloadInput.fileInfo[RightSide].patchBehaviour = DiffFileInfo::PatchEditor; reloadInput.binaryFiles = (leftResult == TextFileFormat::ReadEncodingError); @@ -284,8 +285,8 @@ QList DiffModifiedFilesController::reloadInputList() const ReloadInput reloadInput; reloadInput.text = {leftText, rightText}; - reloadInput.fileInfo = {DiffFileInfo(fileName, tr("Saved")), - DiffFileInfo(fileName, tr("Modified"))}; + reloadInput.fileInfo = {DiffFileInfo(fileName, Tr::tr("Saved")), + DiffFileInfo(fileName, Tr::tr("Modified"))}; reloadInput.fileInfo[RightSide].patchBehaviour = DiffFileInfo::PatchEditor; reloadInput.binaryFiles = (leftResult == TextFileFormat::ReadEncodingError); @@ -381,21 +382,19 @@ void DiffEditorServiceImpl::diffFiles(const QString &leftFileName, const QString { const QString documentId = Constants::DIFF_EDITOR_PLUGIN + QLatin1String(".DiffFiles.") + leftFileName + QLatin1Char('.') + rightFileName; - const QString title = tr("Diff Files"); + const QString title = Tr::tr("Diff Files"); reload(documentId, title, leftFileName, rightFileName); } void DiffEditorServiceImpl::diffModifiedFiles(const QStringList &fileNames) { const QString documentId = Constants::DIFF_EDITOR_PLUGIN + QLatin1String(".DiffModifiedFiles"); - const QString title = tr("Diff Modified Files"); + const QString title = Tr::tr("Diff Modified Files"); reload(documentId, title, fileNames); } class DiffEditorPluginPrivate : public QObject { - Q_DECLARE_TR_FUNCTIONS(DiffEditor::Internal::DiffEditorPlugin) - public: DiffEditorPluginPrivate(); @@ -420,22 +419,22 @@ DiffEditorPluginPrivate::DiffEditorPluginPrivate() ActionContainer *toolsContainer = ActionManager::actionContainer(Core::Constants::M_TOOLS); toolsContainer->insertGroup(Core::Constants::G_TOOLS_DEBUG, Constants::G_TOOLS_DIFF); ActionContainer *diffContainer = ActionManager::createMenu("Diff"); - diffContainer->menu()->setTitle(tr("&Diff")); + diffContainer->menu()->setTitle(Tr::tr("&Diff")); toolsContainer->addMenu(diffContainer, Constants::G_TOOLS_DIFF); - m_diffCurrentFileAction = new QAction(tr("Diff Current File"), this); + m_diffCurrentFileAction = new QAction(Tr::tr("Diff Current File"), this); Command *diffCurrentFileCommand = ActionManager::registerAction(m_diffCurrentFileAction, "DiffEditor.DiffCurrentFile"); - diffCurrentFileCommand->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+H") : tr("Ctrl+H"))); + diffCurrentFileCommand->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+H") : Tr::tr("Ctrl+H"))); connect(m_diffCurrentFileAction, &QAction::triggered, this, &DiffEditorPluginPrivate::diffCurrentFile); diffContainer->addAction(diffCurrentFileCommand); - m_diffOpenFilesAction = new QAction(tr("Diff Open Files"), this); + m_diffOpenFilesAction = new QAction(Tr::tr("Diff Open Files"), this); Command *diffOpenFilesCommand = ActionManager::registerAction(m_diffOpenFilesAction, "DiffEditor.DiffOpenFiles"); - diffOpenFilesCommand->setDefaultKeySequence(QKeySequence(useMacShortcuts ? tr("Meta+Shift+H") : tr("Ctrl+Shift+H"))); + diffOpenFilesCommand->setDefaultKeySequence(QKeySequence(useMacShortcuts ? Tr::tr("Meta+Shift+H") : Tr::tr("Ctrl+Shift+H"))); connect(m_diffOpenFilesAction, &QAction::triggered, this, &DiffEditorPluginPrivate::diffOpenFiles); diffContainer->addAction(diffOpenFilesCommand); - QAction *diffExternalFilesAction = new QAction(tr("Diff External Files..."), this); + QAction *diffExternalFilesAction = new QAction(Tr::tr("Diff External Files..."), this); Command *diffExternalFilesCommand = ActionManager::registerAction(diffExternalFilesAction, "DiffEditor.DiffExternalFiles"); connect(diffExternalFilesAction, &QAction::triggered, this, &DiffEditorPluginPrivate::diffExternalFiles); diffContainer->addAction(diffExternalFilesCommand); @@ -482,25 +481,25 @@ void DiffEditorPluginPrivate::diffCurrentFile() return; const QString documentId = Constants::DIFF_EDITOR_PLUGIN + QLatin1String(".Diff.") + fileName; - const QString title = tr("Diff \"%1\"").arg(fileName); + const QString title = Tr::tr("Diff \"%1\"").arg(fileName); reload(documentId, title, fileName); } void DiffEditorPluginPrivate::diffOpenFiles() { const QString documentId = Constants::DIFF_EDITOR_PLUGIN + QLatin1String(".DiffOpenFiles"); - const QString title = tr("Diff Open Files"); + const QString title = Tr::tr("Diff Open Files"); reload(documentId, title); } void DiffEditorPluginPrivate::diffExternalFiles() { - const FilePath filePath1 = FileUtils::getOpenFilePath(nullptr, tr("Select First File for Diff")); + const FilePath filePath1 = FileUtils::getOpenFilePath(nullptr, Tr::tr("Select First File for Diff")); if (filePath1.isEmpty()) return; if (EditorManager::skipOpeningBigTextFile(filePath1)) return; - const FilePath filePath2 = FileUtils::getOpenFilePath(nullptr, tr("Select Second File for Diff")); + const FilePath filePath2 = FileUtils::getOpenFilePath(nullptr, Tr::tr("Select Second File for Diff")); if (filePath2.isEmpty()) return; if (EditorManager::skipOpeningBigTextFile(filePath2)) @@ -508,7 +507,7 @@ void DiffEditorPluginPrivate::diffExternalFiles() const QString documentId = QLatin1String(Constants::DIFF_EDITOR_PLUGIN) + ".DiffExternalFiles." + filePath1.toString() + '.' + filePath2.toString(); - const QString title = tr("Diff \"%1\", \"%2\"").arg(filePath1.toString(), filePath2.toString()); + const QString title = Tr::tr("Diff \"%1\", \"%2\"").arg(filePath1.toString(), filePath2.toString()); reload(documentId, title, filePath1.toString(), filePath2.toString()); } diff --git a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp index 50b6eb8419..e3f321c7c4 100644 --- a/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp +++ b/src/plugins/diffeditor/diffeditorwidgetcontroller.cpp @@ -5,6 +5,7 @@ #include "diffeditorconstants.h" #include "diffeditorcontroller.h" #include "diffeditordocument.h" +#include "diffeditortr.h" #include #include @@ -225,7 +226,7 @@ void DiffEditorWidgetController::addCodePasterAction(QMenu *menu, int fileIndex, { if (ExtensionSystem::PluginManager::getObject()) { // optional code pasting service - QAction *sendChunkToCodePasterAction = menu->addAction(tr("Send Chunk to CodePaster...")); + QAction *sendChunkToCodePasterAction = menu->addAction(Tr::tr("Send Chunk to CodePaster...")); connect(sendChunkToCodePasterAction, &QAction::triggered, this, [this, fileIndex, chunkIndex] { sendChunkToCodePaster(fileIndex, chunkIndex); }); @@ -264,8 +265,8 @@ bool DiffEditorWidgetController::fileNamesAreDifferent(int fileIndex) const void DiffEditorWidgetController::addPatchAction(QMenu *menu, int fileIndex, int chunkIndex, PatchAction patchAction) { - const QString actionName = patchAction == PatchAction::Apply ? tr("Apply Chunk...") - : tr("Revert Chunk..."); + const QString actionName = patchAction == PatchAction::Apply ? Tr::tr("Apply Chunk...") + : Tr::tr("Revert Chunk..."); QAction *action = menu->addAction(actionName); connect(action, &QAction::triggered, this, [this, fileIndex, chunkIndex, patchAction] { patch(patchAction, fileIndex, chunkIndex); @@ -293,10 +294,10 @@ void DiffEditorWidgetController::updateCannotDecodeInfo() if (!infoBar->canInfoBeAdded(selectEncodingId)) return; InfoBarEntry info(selectEncodingId, - tr("Error: Could not decode \"%1\" with \"%2\"-encoding.") + Tr::tr("Error: Could not decode \"%1\" with \"%2\"-encoding.") .arg(m_document->displayName(), QString::fromLatin1(m_document->codec()->name()))); - info.addCustomButton(tr("Select Encoding"), [this] { m_document->selectEncoding(); }); + info.addCustomButton(Tr::tr("Select Encoding"), [this] { m_document->selectEncoding(); }); infoBar->addInfo(info); } else { infoBar->removeInfo(selectEncodingId); diff --git a/src/plugins/diffeditor/diffview.cpp b/src/plugins/diffeditor/diffview.cpp index 42f7ad034e..8ff444066a 100644 --- a/src/plugins/diffeditor/diffview.cpp +++ b/src/plugins/diffeditor/diffview.cpp @@ -6,6 +6,7 @@ #include "diffeditorconstants.h" #include "diffeditordocument.h" #include "diffeditoricons.h" +#include "diffeditortr.h" #include "unifieddiffeditorwidget.h" #include "sidebysidediffeditorwidget.h" @@ -73,7 +74,7 @@ UnifiedView::UnifiedView() { setId(Constants::UNIFIED_VIEW_ID); setIcon(Icons::UNIFIED_DIFF.icon()); - setToolTip(QCoreApplication::translate("DiffEditor::UnifiedView", "Switch to Unified Diff Editor")); + setToolTip(Tr::tr("Switch to Unified Diff Editor")); } QWidget *UnifiedView::widget() @@ -100,10 +101,10 @@ void UnifiedView::setDocument(DiffEditorDocument *document) switch (document->state()) { case DiffEditorDocument::Reloading: - m_widget->clear(tr("Waiting for data...")); + m_widget->clear(Tr::tr("Waiting for data...")); break; case DiffEditorDocument::LoadFailed: - m_widget->clear(tr("Retrieving data failed.")); + m_widget->clear(Tr::tr("Retrieving data failed.")); break; default: break; @@ -116,7 +117,7 @@ void UnifiedView::beginOperation() DiffEditorDocument *document = m_widget->diffDocument(); if (document && document->state() == DiffEditorDocument::LoadOK) m_widget->saveState(); - m_widget->clear(tr("Waiting for data...")); + m_widget->clear(Tr::tr("Waiting for data...")); } void UnifiedView::setDiff(const QList &diffFileList) @@ -131,7 +132,7 @@ void UnifiedView::endOperation(bool success) if (success) m_widget->restoreState(); else - m_widget->clear(tr("Retrieving data failed.")); + m_widget->clear(Tr::tr("Retrieving data failed.")); } void UnifiedView::setCurrentDiffFileIndex(int index) @@ -150,10 +151,9 @@ SideBySideView::SideBySideView() { setId(Constants::SIDE_BY_SIDE_VIEW_ID); setIcon(Icons::SIDEBYSIDE_DIFF.icon()); - setToolTip(QCoreApplication::translate("DiffEditor::SideBySideView", - "Switch to Side By Side Diff Editor")); + setToolTip(Tr::tr("Switch to Side By Side Diff Editor")); setSupportsSync(true); - setSyncToolTip(tr("Synchronize Horizontal Scroll Bars")); + setSyncToolTip(Tr::tr("Synchronize Horizontal Scroll Bars")); } QWidget *SideBySideView::widget() @@ -181,10 +181,10 @@ void SideBySideView::setDocument(DiffEditorDocument *document) switch (document->state()) { case DiffEditorDocument::Reloading: - m_widget->clear(tr("Waiting for data...")); + m_widget->clear(Tr::tr("Waiting for data...")); break; case DiffEditorDocument::LoadFailed: - m_widget->clear(tr("Retrieving data failed.")); + m_widget->clear(Tr::tr("Retrieving data failed.")); break; default: break; @@ -197,7 +197,7 @@ void SideBySideView::beginOperation() DiffEditorDocument *document = m_widget->diffDocument(); if (document && document->state() == DiffEditorDocument::LoadOK) m_widget->saveState(); - m_widget->clear(tr("Waiting for data...")); + m_widget->clear(Tr::tr("Waiting for data...")); } void SideBySideView::setCurrentDiffFileIndex(int index) @@ -218,7 +218,7 @@ void SideBySideView::endOperation(bool success) if (success) m_widget->restoreState(); else - m_widget->clear(tr("Retrieving data failed.")); + m_widget->clear(Tr::tr("Retrieving data failed.")); } void SideBySideView::setSync(bool sync) diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp index b9372459bf..5bc887b90a 100644 --- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp +++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp @@ -6,6 +6,7 @@ #include "diffeditorconstants.h" #include "diffeditordocument.h" #include "diffeditorplugin.h" +#include "diffeditortr.h" #include #include @@ -550,10 +551,10 @@ void SideDiffEditorWidget::jumpToOriginalFile(const QTextCursor &cursor) static QString skippedText(int skippedNumber) { if (skippedNumber > 0) - return SideBySideDiffEditorWidget::tr("Skipped %n lines...", nullptr, skippedNumber); + return Tr::tr("Skipped %n lines...", nullptr, skippedNumber); if (skippedNumber == -2) - return SideBySideDiffEditorWidget::tr("Binary files differ"); - return SideBySideDiffEditorWidget::tr("Skipped unknown number of lines..."); + return Tr::tr("Binary files differ"); + return Tr::tr("Skipped unknown number of lines..."); } void SideDiffEditorWidget::paintEvent(QPaintEvent *e) @@ -588,7 +589,7 @@ void SideDiffEditorWidget::paintEvent(QPaintEvent *e) if (!fileInfo.fileName.isEmpty()) { const QString fileNameText = fileInfo.typeInfo.isEmpty() ? fileInfo.fileName - : tr("[%1] %2").arg(fileInfo.typeInfo, fileInfo.fileName); + : Tr::tr("[%1] %2").arg(fileInfo.typeInfo, fileInfo.fileName); paintSeparator(painter, m_fileLineForeground, fileNameText, currentBlock, top); } @@ -817,11 +818,11 @@ void SideBySideDiffEditorWidget::setDiff(const QList &diffFileList) { const GuardLocker locker(m_controller.m_ignoreChanges); for (SideDiffEditorWidget *editor : m_editor) - editor->clearAll(tr("Waiting for data...")); + editor->clearAll(Tr::tr("Waiting for data...")); m_controller.m_contextFileData = diffFileList; if (m_controller.m_contextFileData.isEmpty()) { - const QString msg = tr("No difference."); + const QString msg = Tr::tr("No difference."); for (SideDiffEditorWidget *editor : m_editor) editor->setPlainText(msg); } else { @@ -875,7 +876,7 @@ void SideBySideDiffEditorWidget::showDiff() connect(m_asyncTask.get(), &AsyncTaskBase::done, this, [this] { if (m_asyncTask->isCanceled()) { for (SideDiffEditorWidget *editor : m_editor) - editor->clearAll(tr("Retrieving data failed.")); + editor->clearAll(Tr::tr("Retrieving data failed.")); } else { const ShowResults results = m_asyncTask->result(); m_editor[LeftSide]->setDiffData(results[LeftSide].diffData); @@ -978,7 +979,7 @@ void SideBySideDiffEditorWidget::showDiff() m_asyncTask->setAsyncCallData(getDocument); m_asyncTask->start(); - ProgressManager::addTask(m_asyncTask->future(), tr("Rendering diff"), "DiffEditor"); + ProgressManager::addTask(m_asyncTask->future(), Tr::tr("Rendering diff"), "DiffEditor"); } void SideBySideDiffEditorWidget::setFontSettings(const FontSettings &fontSettings) diff --git a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp index 2bfa2d8cde..8c8bee05c2 100644 --- a/src/plugins/diffeditor/unifieddiffeditorwidget.cpp +++ b/src/plugins/diffeditor/unifieddiffeditorwidget.cpp @@ -6,6 +6,7 @@ #include "diffeditorconstants.h" #include "diffeditordocument.h" #include "diffeditorplugin.h" +#include "diffeditortr.h" #include #include @@ -42,7 +43,7 @@ UnifiedDiffEditorWidget::UnifiedDiffEditorWidget(QWidget *parent) this, &UnifiedDiffEditorWidget::setFontSettings); setFontSettings(TextEditorSettings::fontSettings()); - clear(tr("No document")); + clear(Tr::tr("No document")); connect(this, &QPlainTextEdit::cursorPositionChanged, this, &UnifiedDiffEditorWidget::slotCursorPositionChangedInEditor); @@ -262,7 +263,7 @@ void UnifiedDiffData::setLineNumber(DiffSide side, int blockNumber, int lineNumb void UnifiedDiffEditorWidget::setDiff(const QList &diffFileList) { const GuardLocker locker(m_controller.m_ignoreChanges); - clear(tr("Waiting for data...")); + clear(Tr::tr("Waiting for data...")); m_controller.m_contextFileData = diffFileList; showDiff(); } @@ -449,7 +450,7 @@ UnifiedDiffOutput UnifiedDiffData::diffOutput(QFutureInterface &fi, int pr void UnifiedDiffEditorWidget::showDiff() { if (m_controller.m_contextFileData.isEmpty()) { - setPlainText(tr("No difference.")); + setPlainText(Tr::tr("No difference.")); return; } @@ -458,7 +459,7 @@ void UnifiedDiffEditorWidget::showDiff() m_controller.setBusyShowing(true); connect(m_asyncTask.get(), &AsyncTaskBase::done, this, [this] { if (m_asyncTask->isCanceled()) { - setPlainText(tr("Retrieving data failed.")); + setPlainText(Tr::tr("Retrieving data failed.")); } else { const ShowResult result = m_asyncTask->result(); m_data = result.diffData; @@ -529,7 +530,7 @@ void UnifiedDiffEditorWidget::showDiff() m_asyncTask->setAsyncCallData(getDocument); m_asyncTask->start(); - ProgressManager::addTask(m_asyncTask->future(), tr("Rendering diff"), "DiffEditor"); + ProgressManager::addTask(m_asyncTask->future(), Tr::tr("Rendering diff"), "DiffEditor"); } void UnifiedDiffEditorWidget::jumpToOriginalFile(const QTextCursor &cursor) -- cgit v1.2.1