DiffEditor: Tr::tr

Change-Id: I71b9908ea332256044120b42ff6af2fc57a89a5e
Reviewed-by: hjk <hjk@qt.io>

share/qtcreator/translations/qtcreator_cs.ts

@@ -50621,16 +50621,10 @@ nelze najít v cestě.</translation>
         <source>Diff Editor</source>
         <translation>Editor rozdílů</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorEditable</name>
     <message>
         <source>Ignore Whitespaces</source>
         <translation type="obsolete">Nevšímat si prázdných míst</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorPlugin</name>
     <message>
         <source>Diff...</source>
         <translation>Rozdíly...</translation>
@@ -50648,9 +50642,6 @@ nelze najít v cestě.</translation>
         <extracomment>Editor title</extracomment>
         <translation>Rozdíly u &quot;%1&quot;, &quot;%2&quot;</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::DiffViewEditorWidget</name>
     <message>
         <source>No difference</source>
         <translation>Žádný rozdíl</translation>
@@ -52933,7 +52924,7 @@ Lze používat části jmen, pokud jsou jednoznačné.</translation>
     </message>
 </context>
 <context>
-    <name>DiffEditor::DiffEditor</name>
+    <name>::DiffEditor</name>
     <message>
         <source>Ignore Whitespace</source>
         <translation>Nevšímat si bílých znaků</translation>
@@ -54853,15 +54844,7 @@ Soubory ve zdrojovém adresáři balíčku pro Android jsou zkopírovány do adr
     </message>
 </context>
 <context>
-    <name>DiffEditor::DiffShowEditor</name>
+    <name>::DiffEditor</name>
-    <message>
-        <source>Hide Change Description</source>
-        <translation>Skrýt popis změny</translation>
-    </message>
-    <message>
-        <source>Show Change Description</source>
-        <translation>Ukázat popis změny</translation>
-    </message>
 </context>
 <context>
     <name>::Git</name>
@@ -56755,44 +56738,15 @@ Vytvořte, prosím, aplikaci qmldump na stránce pro nastavení verze Qt.</trans
     </message>
 </context>
 <context>
-    <name>DiffEditor::DiffEditorController</name>
+    <name>::DiffEditor</name>
-    <message>
-        <source>No difference</source>
-        <translation>Žádný rozdíl</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::DiffEditorManager</name>
     <message>
         <source>Waiting for data...</source>
         <translation>Čeká se na data...</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::SideDiffEditorWidget</name>
-    <message numerus="yes">
-        <source>Skipped %n lines...</source>
-        <translation>
-            <numerusform>Přeskočen %n řádek...</numerusform>
-            <numerusform>Přeskočeny %n řádky...</numerusform>
-            <numerusform>Přeskočeno %n řádků...</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>[%1] %2</source>
-        <translation>[%1] %2</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::SideBySideDiffEditorWidget</name>
     <message>
         <source>No controller</source>
         <translation>Žádný ovladač</translation>
     </message>
-    <message>
-        <source>No difference</source>
-        <translation>Žádný rozdíl</translation>
-    </message>
 </context>
 <context>
     <name>::ProjectExplorer</name>

share/qtcreator/translations/qtcreator_da.ts

@@ -13963,9 +13963,6 @@ Det hjælper måske at genbygge projektet.</translation>
         <source>Diff Editor</source>
         <translation>Diff-redigering</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffCurrentFileController</name>
     <message>
         <source>Saved</source>
         <translation>Gemt</translation>
@@ -13974,9 +13971,6 @@ Det hjælper måske at genbygge projektet.</translation>
         <source>Modified</source>
         <translation>Ændret</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditor</name>
     <message>
         <source>Context lines:</source>
         <translation>Kontekst linjer:</translation>
@@ -14009,16 +14003,10 @@ Det hjælper måske at genbygge projektet.</translation>
         <source>Show Change Description</source>
         <translation>Vis ændringsbeskrivelse</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorDocument</name>
     <message>
         <source>Could not parse patch file &quot;%1&quot;. The content is not of unified diff format.</source>
         <translation>Kunne ikke parse patch-filen &quot;%1&quot;. Indholdet er ikke unified diff-format.</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorPlugin</name>
     <message>
         <source>&amp;Diff</source>
         <translation>&amp;Diff</translation>
@@ -14067,9 +14055,6 @@ Det hjælper måske at genbygge projektet.</translation>
         <source>Diff &quot;%1&quot;, &quot;%2&quot;</source>
         <translation>Diff &quot;%1&quot;, &quot;%2&quot;</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorServiceImpl</name>
     <message>
         <source>Diff Files</source>
         <translation>Diff filer</translation>
@@ -14078,9 +14063,6 @@ Det hjælper måske at genbygge projektet.</translation>
         <source>Diff Modified Files</source>
         <translation>Diff ændrede filer</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorWidgetController</name>
     <message>
         <source>Revert Chunk</source>
         <translation>Tilbagefør bid</translation>
@@ -14109,38 +14091,10 @@ Det hjælper måske at genbygge projektet.</translation>
         <source>Revert Chunk...</source>
         <translation>Tilbagefør bid...</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffFilesController</name>
     <message>
         <source>Calculating diff</source>
         <translation>Udregninger diff</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffModifiedFilesController</name>
-    <message>
-        <source>Saved</source>
-        <translation>Gemt</translation>
-    </message>
-    <message>
-        <source>Modified</source>
-        <translation>Ændret</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffOpenFilesController</name>
-    <message>
-        <source>Saved</source>
-        <translation>Gemt</translation>
-    </message>
-    <message>
-        <source>Modified</source>
-        <translation>Ændret</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideBySideDiffEditorWidget</name>
     <message numerus="yes">
         <source>Skipped %n lines...</source>
         <translation>
@@ -14160,9 +14114,6 @@ Det hjælper måske at genbygge projektet.</translation>
         <source>No difference.</source>
         <translation>Ingen forskel.</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideBySideView</name>
     <message>
         <source>Synchronize Horizontal Scroll Bars</source>
         <translation>Synkroniser vandrette rullebjælker</translation>
@@ -14175,45 +14126,18 @@ Det hjælper måske at genbygge projektet.</translation>
         <source>Retrieving data failed.</source>
         <translation>Kunne ikke hente data.</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideDiffEditorWidget</name>
     <message>
         <source>[%1] %2</source>
         <translation>[%1] %2</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::UnifiedDiffEditorWidget</name>
     <message>
         <source>No document</source>
         <translation>Intet dokument</translation>
     </message>
-    <message>
-        <source>No difference.</source>
-        <translation>Ingen forskel.</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::UnifiedView</name>
-    <message>
-        <source>Waiting for data...</source>
-        <translation>Venter på data...</translation>
-    </message>
-    <message>
-        <source>Retrieving data failed.</source>
-        <translation>Kunne ikke hente data.</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::SideBySideView</name>
     <message>
         <source>Switch to Side By Side Diff Editor</source>
         <translation>Skift til side-om-side diff-redigering</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::UnifiedView</name>
     <message>
         <source>Switch to Unified Diff Editor</source>
         <translation>Skift til unified diff-redigering</translation>

share/qtcreator/translations/qtcreator_de.ts

@@ -27719,9 +27719,6 @@ The affected files are:
         <source>Diff Editor</source>
         <translation>Diff-Editor</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorPlugin</name>
     <message>
         <source>&amp;Diff</source>
         <translation>&amp;Diff</translation>
@@ -34696,7 +34693,7 @@ provided they were unmodified before the refactoring.</source>
     </message>
 </context>
 <context>
-    <name>DiffEditor::Internal::DiffEditor</name>
+    <name>::DiffEditor</name>
     <message>
         <source>Context lines:</source>
         <translation>Kontextzeilen:</translation>
@@ -34729,23 +34726,14 @@ provided they were unmodified before the refactoring.</source>
         <source>Show Change Description</source>
         <translation>Beschreibung der Änderung einblenden</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorDocument</name>
     <message>
         <source>Could not parse patch file &quot;%1&quot;. The content is not of unified diff format.</source>
         <translation>Die Patch-Datei &quot;%1&quot; konnte nicht ausgewertet werden. Der Inhalt ist nicht im vereinheitlichten Format.</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::UnifiedView</name>
     <message>
         <source>Switch to Unified Diff Editor</source>
         <translation>Unterschiede im vereinheitlichten Format anzeigen</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::UnifiedView</name>
     <message>
         <source>Waiting for data...</source>
         <translation>Warte auf Daten...</translation>
@@ -34754,31 +34742,14 @@ provided they were unmodified before the refactoring.</source>
         <source>Retrieving data failed.</source>
         <translation>Es konnten keine Daten empfangen werden.</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::SideBySideView</name>
     <message>
         <source>Switch to Side By Side Diff Editor</source>
         <translation>Unterschiede nebeneinander anzeigen</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideBySideView</name>
     <message>
         <source>Synchronize Horizontal Scroll Bars</source>
         <translation>Horizontale Bildlaufleisten synchronisieren</translation>
     </message>
-    <message>
-        <source>Waiting for data...</source>
-        <translation>Warte auf Daten...</translation>
-    </message>
-    <message>
-        <source>Retrieving data failed.</source>
-        <translation>Es konnten keine Daten empfangen werden.</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideBySideDiffEditorWidget</name>
     <message numerus="yes">
         <source>Skipped %n lines...</source>
         <translation>
@@ -34794,52 +34765,22 @@ provided they were unmodified before the refactoring.</source>
         <source>Skipped unknown number of lines...</source>
         <translation>Unbekannte Anzahl von Zeilen übersprungen...</translation>
     </message>
-    <message>
-        <source>Waiting for data...</source>
-        <translation type="unfinished">Warte auf Daten...</translation>
-    </message>
     <message>
         <source>No difference.</source>
         <translation>Kein Unterschied.</translation>
     </message>
-    <message>
-        <source>Retrieving data failed.</source>
-        <translation type="unfinished">Es konnten keine Daten empfangen werden.</translation>
-    </message>
     <message>
         <source>Rendering diff</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideDiffEditorWidget</name>
     <message>
         <source>[%1] %2</source>
         <translation>[%1] %2</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::UnifiedDiffEditorWidget</name>
     <message>
         <source>No document</source>
         <translation>Kein Dokument</translation>
     </message>
-    <message>
-        <source>Waiting for data...</source>
-        <translation type="unfinished">Warte auf Daten...</translation>
-    </message>
-    <message>
-        <source>No difference.</source>
-        <translation>Kein Unterschied.</translation>
-    </message>
-    <message>
-        <source>Retrieving data failed.</source>
-        <translation type="unfinished">Es konnten keine Daten empfangen werden.</translation>
-    </message>
-    <message>
-        <source>Rendering diff</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ModelEditor::Internal::ActionHandler</name>
@@ -39662,14 +39603,11 @@ Zeile: %4, Spalte: %5
     </message>
 </context>
 <context>
-    <name>DiffEditor::Internal::DiffFilesController</name>
+    <name>::DiffEditor</name>
     <message>
         <source>Calculating diff</source>
         <translation>Bestimme Unterschiede</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffCurrentFileController</name>
     <message>
         <source>Saved</source>
         <translation>Gespeichert</translation>
@@ -39678,31 +39616,6 @@ Zeile: %4, Spalte: %5
         <source>Modified</source>
         <translation>Geändert</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffOpenFilesController</name>
-    <message>
-        <source>Saved</source>
-        <translation>Gespeichert</translation>
-    </message>
-    <message>
-        <source>Modified</source>
-        <translation>Geändert</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffModifiedFilesController</name>
-    <message>
-        <source>Saved</source>
-        <translation>Gespeichert</translation>
-    </message>
-    <message>
-        <source>Modified</source>
-        <translation>Geändert</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorServiceImpl</name>
     <message>
         <source>Diff Files</source>
         <translation>Unterschiede zwischen Dateien anzeigen</translation>
@@ -39711,9 +39624,6 @@ Zeile: %4, Spalte: %5
         <source>Diff Modified Files</source>
         <translation>Unterschiede zwischen geänderten Dateien anzeigen</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorWidgetController</name>
     <message>
         <source>Send Chunk to CodePaster...</source>
         <translation>Änderung an CodePaster senden...</translation>

share/qtcreator/translations/qtcreator_fr.ts

@@ -48660,7 +48660,7 @@ Les noms partiels peuvent êtres utilisé s&apos;ils ne sont pas ambigües.</tra
     </message>
 </context>
 <context>
-    <name>DiffEditor::DiffEditor</name>
+    <name>::DiffEditor</name>
     <message>
         <source>Ignore Whitespace</source>
         <translation>Ignorer les espaces</translation>
@@ -48685,16 +48685,10 @@ Les noms partiels peuvent êtres utilisé s&apos;ils ne sont pas ambigües.</tra
         <source>[%1] %2 vs. [%3] %4</source>
         <translation>[%1] %2 contre [%3] %4</translation>
     </message>
-</context>
-<context>
-    <name>::DiffEditor</name>
     <message>
         <source>Diff Editor</source>
         <translation>Éditeur de différences</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorPlugin</name>
     <message>
         <source>Diff...</source>
         <translation>Diff...</translation>
@@ -48712,9 +48706,6 @@ Les noms partiels peuvent êtres utilisé s&apos;ils ne sont pas ambigües.</tra
         <extracomment>Editor title</extracomment>
         <translation>Diff &quot;%1&quot;, &quot;%2&quot;</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::DiffViewEditorWidget</name>
     <message>
         <source>No difference</source>
         <translation>Aucune différence</translation>
@@ -51615,7 +51606,7 @@ réinitialisation du moniteur</translation>
     </message>
 </context>
 <context>
-    <name>DiffEditor::DiffShowEditor</name>
+    <name>::DiffEditor</name>
     <message>
         <source>Hide Change Description</source>
         <translation>Masquer la description des changements</translation>

share/qtcreator/translations/qtcreator_hr.ts

@@ -22428,7 +22428,7 @@ Možda će ponovna gradnja projekta pomoći.</translation>
     </message>
 </context>
 <context>
-    <name>DiffEditor::Internal::DiffEditor</name>
+    <name>::DiffEditor</name>
     <message>
         <source>Context lines:</source>
         <translation>Retci konteksta:</translation>
@@ -22461,30 +22461,18 @@ Možda će ponovna gradnja projekta pomoći.</translation>
         <source>Show Change Description</source>
         <translation>Prikaži opis promjena</translation>
     </message>
-</context>
-<context>
-    <name>::DiffEditor</name>
     <message>
         <source>Diff Editor</source>
         <translation>Uređivač za razlike</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorDocument</name>
     <message>
         <source>Could not parse patch file &quot;%1&quot;. The content is not of unified diff format.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffFilesController</name>
     <message>
         <source>Calculating diff</source>
         <translation>Izračunavanje razlika</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffCurrentFileController</name>
     <message>
         <source>Saved</source>
         <translation>Spremljeno</translation>
@@ -22493,31 +22481,6 @@ Možda će ponovna gradnja projekta pomoći.</translation>
         <source>Modified</source>
         <translation>Promijenjeno</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffOpenFilesController</name>
-    <message>
-        <source>Saved</source>
-        <translation>Spremljeno</translation>
-    </message>
-    <message>
-        <source>Modified</source>
-        <translation>Promijenjeno</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffModifiedFilesController</name>
-    <message>
-        <source>Saved</source>
-        <translation>Spremljeno</translation>
-    </message>
-    <message>
-        <source>Modified</source>
-        <translation>Promijenjeno</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorServiceImpl</name>
     <message>
         <source>Diff Files</source>
         <translation>Datoteke razlika</translation>
@@ -22526,9 +22489,6 @@ Možda će ponovna gradnja projekta pomoći.</translation>
         <source>Diff Modified Files</source>
         <translation>Datoteke razlika promjena</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorPlugin</name>
     <message>
         <source>&amp;Diff</source>
         <translation>&amp;Razlike</translation>
@@ -22577,9 +22537,6 @@ Možda će ponovna gradnja projekta pomoći.</translation>
         <source>Diff &quot;%1&quot;, &quot;%2&quot;</source>
         <translation>Razlike &quot;%1&quot;, &quot;%2&quot;</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorWidgetController</name>
     <message>
         <source>Revert Chunk</source>
         <translation>Vrati komad</translation>
@@ -22608,16 +22565,10 @@ Možda će ponovna gradnja projekta pomoći.</translation>
         <source>Revert Chunk...</source>
         <translation>Vrati komad …</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::UnifiedView</name>
     <message>
         <source>Switch to Unified Diff Editor</source>
         <translation>Prebaci na uređivač za ujedinjene razlike</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::UnifiedView</name>
     <message>
         <source>Waiting for data...</source>
         <translation>Čekanje na podatke …</translation>
@@ -22626,31 +22577,14 @@ Možda će ponovna gradnja projekta pomoći.</translation>
         <source>Retrieving data failed.</source>
         <translation>Neuspjelo dohvaćanje podataka.</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::SideBySideView</name>
     <message>
         <source>Switch to Side By Side Diff Editor</source>
         <translation>Prebaci uređivača na usporedni prikaz razlika</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideBySideView</name>
     <message>
         <source>Synchronize Horizontal Scroll Bars</source>
         <translation>Sinkroniziraj vodoravne klizne trake</translation>
     </message>
-    <message>
-        <source>Waiting for data...</source>
-        <translation>Čekanje na podatke …</translation>
-    </message>
-    <message>
-        <source>Retrieving data failed.</source>
-        <translation>Neuspjelo dohvaćanje podataka.</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideBySideDiffEditorWidget</name>
     <message numerus="yes">
         <source>Skipped %n lines...</source>
         <translation>
@@ -22671,24 +22605,14 @@ Možda će ponovna gradnja projekta pomoći.</translation>
         <source>No difference.</source>
         <translation>Nema razlike.</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideDiffEditorWidget</name>
     <message>
         <source>[%1] %2</source>
         <translation>[%1] %2</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::UnifiedDiffEditorWidget</name>
     <message>
         <source>No document</source>
         <translation>Nema dokumenta</translation>
     </message>
-    <message>
-        <source>No difference.</source>
-        <translation>Nema razlike.</translation>
-    </message>
 </context>
 <context>
     <name>EmacsKeys::Internal::EmacsKeysPlugin</name>

share/qtcreator/translations/qtcreator_ja.ts

@@ -19408,9 +19408,6 @@ Rebuilding the project might help.</source>
         <source>Diff Editor</source>
         <translation>差分エディタ</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorPlugin</name>
     <message>
         <source>Diff...</source>
         <translation>差分...</translation>
@@ -32591,7 +32588,7 @@ kill しますか？</translation>
     </message>
 </context>
 <context>
-    <name>DiffEditor::DiffEditorController</name>
+    <name>::DiffEditor</name>
     <message numerus="yes">
         <source>and %n more</source>
         <extracomment>Displayed after the untranslated message &quot;Branches: branch1, branch2 &apos;and %n more&apos;&quot;</extracomment>
@@ -39115,7 +39112,7 @@ Preselects a desktop Qt for building the application if available.</source>
     </message>
 </context>
 <context>
-    <name>DiffEditor::Internal::DiffEditor</name>
+    <name>::DiffEditor</name>
     <message>
         <source>Context lines:</source>
         <translation>コンテキスト行:</translation>
@@ -39148,23 +39145,14 @@ Preselects a desktop Qt for building the application if available.</source>
         <source>Show Change Description</source>
         <translation>差分の記述を表示する</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorDocument</name>
     <message>
         <source>Could not parse patch file &quot;%1&quot;. The content is not of unified diff format.</source>
         <translation>パッチファイル &quot;%1&quot; を解析できませんでした。コンテンツがユニファイド diff 形式ではありません。</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::UnifiedView</name>
     <message>
         <source>Switch to Unified Diff Editor</source>
         <translation>ユニファイド形式の差分エディタに切り替える</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::UnifiedView</name>
     <message>
         <source>Waiting for data...</source>
         <translation>データ待機中...</translation>
@@ -39173,31 +39161,14 @@ Preselects a desktop Qt for building the application if available.</source>
         <source>Failed</source>
         <translation>失敗</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::SideBySideView</name>
     <message>
         <source>Switch to Side By Side Diff Editor</source>
         <translation>サイドバイサイドの差分エディタに切り替える</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideBySideView</name>
     <message>
         <source>Synchronize Horizontal Scroll Bars</source>
         <translation>水平スクロールバーを同期する</translation>
     </message>
-    <message>
-        <source>Waiting for data...</source>
-        <translation>データ待機中...</translation>
-    </message>
-    <message>
-        <source>Failed</source>
-        <translation>失敗</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideBySideDiffEditorWidget</name>
     <message numerus="yes">
         <source>Skipped %n lines...</source>
         <translation>
@@ -39248,52 +39219,14 @@ Preselects a desktop Qt for building the application if available.</source>
         <source>Would you like to apply the chunk?</source>
         <translation>チャンクを適用しますか？</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideDiffEditorWidget</name>
     <message>
         <source>[%1] %2</source>
         <translation>[%1] %2</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::UnifiedDiffEditorWidget</name>
     <message>
         <source>No document</source>
         <translation>ドキュメントなし</translation>
     </message>
-    <message>
-        <source>Send Chunk to CodePaster...</source>
-        <translation>CodePaster にチャンクを送る...</translation>
-    </message>
-    <message>
-        <source>Apply Chunk...</source>
-        <translation>チャンクの適用...</translation>
-    </message>
-    <message>
-        <source>Revert Chunk...</source>
-        <translation>チャンクを元に戻す...</translation>
-    </message>
-    <message>
-        <source>Revert Chunk</source>
-        <translation>チャンクを元に戻す</translation>
-    </message>
-    <message>
-        <source>Apply Chunk</source>
-        <translation>チャンクの適用</translation>
-    </message>
-    <message>
-        <source>Would you like to revert the chunk?</source>
-        <translation>チャンクを元に戻しますか？</translation>
-    </message>
-    <message>
-        <source>Would you like to apply the chunk?</source>
-        <translation>チャンクを適用しますか？</translation>
-    </message>
-    <message>
-        <source>No difference.</source>
-        <translation>差分がありません。</translation>
-    </message>
 </context>
 <context>
     <name>::FakeVim</name>
@@ -45981,56 +45914,11 @@ Stepping into the module or setting breakpoints by file and line is expected to
     </message>
 </context>
 <context>
-    <name>DiffEditor::Internal::DiffCurrentFileController</name>
+    <name>::DiffEditor</name>
     <message>
         <source>Modified</source>
         <translation>変更</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffOpenFilesController</name>
-    <message>
-        <source>Modified</source>
-        <translation>変更</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffModifiedFilesController</name>
-    <message>
-        <source>Modified</source>
-        <translation>変更</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorWidgetController</name>
-    <message>
-        <source>Revert Chunk</source>
-        <translation>チャンクを元に戻す</translation>
-    </message>
-    <message>
-        <source>Apply Chunk</source>
-        <translation>チャンクの適用</translation>
-    </message>
-    <message>
-        <source>Would you like to revert the chunk?</source>
-        <translation>チャンクを元に戻しますか？</translation>
-    </message>
-    <message>
-        <source>Would you like to apply the chunk?</source>
-        <translation>チャンクを適用しますか？</translation>
-    </message>
-    <message>
-        <source>Send Chunk to CodePaster...</source>
-        <translation>CodePaster にチャンクを送る...</translation>
-    </message>
-    <message>
-        <source>Apply Chunk...</source>
-        <translation>チャンクの適用...</translation>
-    </message>
-    <message>
-        <source>Revert Chunk...</source>
-        <translation>チャンクを元に戻す...</translation>
-    </message>
     <message>
         <source>Select Encoding</source>
         <translation>文字コードの選択</translation>

share/qtcreator/translations/qtcreator_pl.ts

@@ -24257,9 +24257,6 @@ Więcej informacji w dokumentacji &quot;Checking Code Syntax&quot;.</translation
         <source>Diff Editor</source>
         <translation>Edytor różnic</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorPlugin</name>
     <message>
         <source>&amp;Diff</source>
         <translation>Po&amp;równaj</translation>
@@ -32637,7 +32634,7 @@ Ustawianie pułapek w liniach plików może się nie udać.</translation>
     </message>
 </context>
 <context>
-    <name>DiffEditor::Internal::DiffEditor</name>
+    <name>::DiffEditor</name>
     <message>
         <source>Context lines:</source>
         <translation>Linie z kontekstem:</translation>
@@ -32670,23 +32667,14 @@ Ustawianie pułapek w liniach plików może się nie udać.</translation>
         <source>Show Change Description</source>
         <translation>Pokaż opis zmiany</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorDocument</name>
     <message>
         <source>Could not parse patch file &quot;%1&quot;. The content is not of unified diff format.</source>
         <translation>Nie można sparsować pliku z łatami &quot;%1&quot;. Zawartość nie jest w formacie ujednoliconym (unified diff).</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::UnifiedView</name>
     <message>
         <source>Switch to Unified Diff Editor</source>
         <translation>Przełącz do edytora różnic wyświetlającego zawartość w formacie ujednoliconym (unified diff)</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::UnifiedView</name>
     <message>
         <source>Waiting for data...</source>
         <translation>Oczekiwanie na dane...</translation>
@@ -32695,31 +32683,14 @@ Ustawianie pułapek w liniach plików może się nie udać.</translation>
         <source>Retrieving data failed.</source>
         <translation>Błąd pobierania danych.</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::SideBySideView</name>
     <message>
         <source>Switch to Side By Side Diff Editor</source>
         <translation>Przełącz do edytora różnic wyświetlającego zawartość sąsiadująco</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideBySideView</name>
     <message>
         <source>Synchronize Horizontal Scroll Bars</source>
         <translation>Synchronizuj poziome paski przesuwania</translation>
     </message>
-    <message>
-        <source>Waiting for data...</source>
-        <translation>Oczekiwanie na dane...</translation>
-    </message>
-    <message>
-        <source>Retrieving data failed.</source>
-        <translation>Błąd pobierania danych.</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideBySideDiffEditorWidget</name>
     <message numerus="yes">
         <source>Skipped %n lines...</source>
         <translation>
@@ -32740,24 +32711,14 @@ Ustawianie pułapek w liniach plików może się nie udać.</translation>
         <source>No difference.</source>
         <translation>Brak różnic.</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideDiffEditorWidget</name>
     <message>
         <source>[%1] %2</source>
         <translation>[%1] %2</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::UnifiedDiffEditorWidget</name>
     <message>
         <source>No document</source>
         <translation>Brak dokumentu</translation>
     </message>
-    <message>
-        <source>No difference.</source>
-        <translation>Brak różnic.</translation>
-    </message>
 </context>
 <context>
     <name>::ImageViewer</name>
@@ -38016,7 +37977,7 @@ Wskakiwanie do wnętrza modułu lub ustawianie pułapek w plikach powinno dział
     </message>
 </context>
 <context>
-    <name>DiffEditor::Internal::DiffCurrentFileController</name>
+    <name>::DiffEditor</name>
     <message>
         <source>Saved</source>
         <translation>Zachowany</translation>
@@ -38025,31 +37986,6 @@ Wskakiwanie do wnętrza modułu lub ustawianie pułapek w plikach powinno dział
         <source>Modified</source>
         <translation>Zmodyfikowany</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffOpenFilesController</name>
-    <message>
-        <source>Saved</source>
-        <translation>Zachowany</translation>
-    </message>
-    <message>
-        <source>Modified</source>
-        <translation>Zmodyfikowany</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffModifiedFilesController</name>
-    <message>
-        <source>Saved</source>
-        <translation>Zachowany</translation>
-    </message>
-    <message>
-        <source>Modified</source>
-        <translation>Zmodyfikowany</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorServiceImpl</name>
     <message>
         <source>Diff Files</source>
         <translation>Pokaż różnice w plikach</translation>
@@ -38058,9 +37994,6 @@ Wskakiwanie do wnętrza modułu lub ustawianie pułapek w plikach powinno dział
         <source>Diff Modified Files</source>
         <translation>Pokaż różnice w zmodyfikowanych plikach</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorWidgetController</name>
     <message>
         <source>Revert Chunk</source>
         <translation>Odwróć zmiany we fragmencie</translation>
@@ -39748,7 +39681,7 @@ Błąd: %2</translation>
     </message>
 </context>
 <context>
-    <name>DiffEditor::Internal::DiffFilesController</name>
+    <name>::DiffEditor</name>
     <message>
         <source>Calculating diff</source>
         <translation>Sporządzanie różnic</translation>

share/qtcreator/translations/qtcreator_ru.ts

@@ -17646,9 +17646,6 @@ Rebuilding the project might help.</source>
         <source>Diff Editor</source>
         <translation>Редактор изменений</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffCurrentFileController</name>
     <message>
         <source>Saved</source>
         <translation>Сохранён</translation>
@@ -17657,9 +17654,6 @@ Rebuilding the project might help.</source>
         <source>Modified</source>
         <translation>Изменён</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditor</name>
     <message>
         <source>Ignore Whitespace</source>
         <translation>Игнорировать пробелы</translation>
@@ -17692,16 +17686,10 @@ Rebuilding the project might help.</source>
         <source>Show Change Description</source>
         <translation>Показать описание изменения</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorDocument</name>
     <message>
         <source>Could not parse patch file &quot;%1&quot;. The content is not of unified diff format.</source>
         <translation>Не удалось разобрать файл изменений «%1». Содержимое не в формате «унифицированный diff».</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorPlugin</name>
     <message>
         <source>&amp;Diff</source>
         <translation>&amp;Сравнить</translation>
@@ -17750,9 +17738,6 @@ Rebuilding the project might help.</source>
         <source>Diff &quot;%1&quot;, &quot;%2&quot;</source>
         <translation>Сравнение «%1» с «%2»</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorServiceImpl</name>
     <message>
         <source>Diff Files</source>
         <translation>Отличия файлов</translation>
@@ -17761,9 +17746,6 @@ Rebuilding the project might help.</source>
         <source>Diff Modified Files</source>
         <translation>Отличия изменённых файлов</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorWidgetController</name>
     <message>
         <source>Revert Chunk</source>
         <translation>Откат фрагмента</translation>
@@ -17800,38 +17782,10 @@ Rebuilding the project might help.</source>
         <source>Select Encoding</source>
         <translation>Выбрать кодировку</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffFilesController</name>
     <message>
         <source>Calculating diff</source>
         <translation>Вычисление отличий</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffModifiedFilesController</name>
-    <message>
-        <source>Saved</source>
-        <translation>Сохранён</translation>
-    </message>
-    <message>
-        <source>Modified</source>
-        <translation>Изменён</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffOpenFilesController</name>
-    <message>
-        <source>Saved</source>
-        <translation>Сохранён</translation>
-    </message>
-    <message>
-        <source>Modified</source>
-        <translation>Изменён</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideBySideDiffEditorWidget</name>
     <message numerus="yes">
         <source>Skipped %n lines...</source>
         <translation>
@@ -17852,9 +17806,6 @@ Rebuilding the project might help.</source>
         <source>No difference.</source>
         <translation>Различий нет.</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideBySideView</name>
     <message>
         <source>Synchronize Horizontal Scroll Bars</source>
         <translation>Согласовать горизонтальные полосы прокрутки</translation>
@@ -17867,45 +17818,18 @@ Rebuilding the project might help.</source>
         <source>Retrieving data failed.</source>
         <translation>Не удалось получить данные.</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideDiffEditorWidget</name>
     <message>
         <source>[%1] %2</source>
         <translation>[%1] %2</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::UnifiedDiffEditorWidget</name>
     <message>
         <source>No document</source>
         <translation>Нет документа</translation>
     </message>
-    <message>
-        <source>No difference.</source>
-        <translation>Различий нет.</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::UnifiedView</name>
-    <message>
-        <source>Waiting for data...</source>
-        <translation>Ожидание данных...</translation>
-    </message>
-    <message>
-        <source>Retrieving data failed.</source>
-        <translation>Не удалось получить данные.</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::SideBySideView</name>
     <message>
         <source>Switch to Side By Side Diff Editor</source>
         <translation>Переключиться в двусторонний редактор отличий</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::UnifiedView</name>
     <message>
         <source>Switch to Unified Diff Editor</source>
         <translation>Переключиться в унифицированный редактор отличий</translation>

share/qtcreator/translations/qtcreator_uk.ts

@@ -30430,9 +30430,6 @@ cannot be found in the path.</source>
         <source>Diff Editor</source>
         <translation>Редактор різниць</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorPlugin</name>
     <message>
         <source>Diff...</source>
         <translation>Порівняти...</translation>
@@ -30450,21 +30447,6 @@ cannot be found in the path.</source>
         <translation>Порівняння &quot;%1&quot; з &quot;%2&quot;</translation>
     </message>
 </context>
-<context>
-    <name>DiffEditor::DiffViewEditorWidget</name>
-    <message numerus="yes">
-        <source>Skipped %n lines...</source>
-        <translation type="vanished">
-            <numerusform>Пропущено %n рядок...</numerusform>
-            <numerusform>Пропущено %n рядки...</numerusform>
-            <numerusform>Пропущено %n рядків...</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>[%1] %2</source>
-        <translation type="vanished">[%1] %2</translation>
-    </message>
-</context>
 <context>
     <name>::Git</name>
     <message>
@@ -32753,11 +32735,7 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d
     </message>
 </context>
 <context>
-    <name>DiffEditor::DiffEditor</name>
+    <name>::DiffEditor</name>
-    <message>
-        <source>Ignore Whitespace</source>
-        <translation type="vanished">Ігнорувати пропуски</translation>
-    </message>
     <message>
         <source>Context Lines:</source>
         <translation type="vanished">Контекстні рядки:</translation>
@@ -32766,30 +32744,6 @@ This wizard will guide you through the essential steps to deploy a ready-to-go d
         <source>Reload Editor</source>
         <translation type="vanished">Перезавантажити редактор</translation>
     </message>
-    <message>
-        <source>Synchronize Horizontal Scroll Bars</source>
-        <translation type="vanished">Синхронізувати горизонтальні смуги прокрутки</translation>
-    </message>
-    <message>
-        <source>[%1] vs. [%2] %3</source>
-        <translation type="vanished">[%1] vs. [%2] %3</translation>
-    </message>
-    <message>
-        <source>%1 vs. %2</source>
-        <translation type="vanished">%1 vs. %2</translation>
-    </message>
-    <message>
-        <source>[%1] %2 vs. [%3] %4</source>
-        <translation type="vanished">[%1] %2 vs. [%3] %4</translation>
-    </message>
-    <message>
-        <source>Hide Change Description</source>
-        <translation type="vanished">Сховати опис зміни</translation>
-    </message>
-    <message>
-        <source>Show Change Description</source>
-        <translation type="vanished">Показати опис зміни</translation>
-    </message>
 </context>
 <context>
     <name>::ProjectExplorer</name>
@@ -36203,11 +36157,7 @@ Do you want to kill it?</source>
     </message>
 </context>
 <context>
-    <name>DiffEditor::DiffEditorController</name>
+    <name>::DiffEditor</name>
-    <message>
-        <source>No difference</source>
-        <translation type="vanished">Немає відмінностей</translation>
-    </message>
     <message numerus="yes">
         <source>and %n more</source>
         <extracomment>Displayed after the untranslated message &quot;Branches: branch1, branch2 &apos;and %n more&apos;&quot;</extracomment>
@@ -36222,91 +36172,6 @@ Do you want to kill it?</source>
         <translation>&lt;Немає&gt;</translation>
     </message>
 </context>
-<context>
-    <name>DiffEditor::DiffEditorManager</name>
-    <message>
-        <source>Waiting for data...</source>
-        <translation type="vanished">Очікування на дані...</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::SideDiffEditorWidget</name>
-    <message numerus="yes">
-        <source>Skipped %n lines...</source>
-        <translation type="vanished">
-            <numerusform>Пропущено %n рядок...</numerusform>
-            <numerusform>Пропущено %n рядки...</numerusform>
-            <numerusform>Пропущено %n рядків...</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>[%1] %2</source>
-        <translation type="vanished">[%1] %2</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::SideBySideDiffEditorWidget</name>
-    <message numerus="yes">
-        <source>Skipped %n lines...</source>
-        <translation type="vanished">
-            <numerusform>Пропущено %n рядок...</numerusform>
-            <numerusform>Пропущено %n рядки...</numerusform>
-            <numerusform>Пропущено %n рядків...</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>Binary files differ</source>
-        <translation type="vanished">Двійкові файли відрізняються</translation>
-    </message>
-    <message>
-        <source>Skipped unknown number of lines...</source>
-        <translation type="vanished">Пропущено невідому кількість рядків...</translation>
-    </message>
-    <message>
-        <source>No controller</source>
-        <translation type="vanished">Відсутній контролер</translation>
-    </message>
-    <message>
-        <source>No difference</source>
-        <translation type="vanished">Немає відмінностей</translation>
-    </message>
-    <message>
-        <source>Send Chunk to CodePaster...</source>
-        <translation type="vanished">Надіслати шматочок до Codepaster...</translation>
-    </message>
-    <message>
-        <source>Apply Chunk...</source>
-        <translation type="vanished">Накласти частину латки...</translation>
-    </message>
-    <message>
-        <source>Revert Chunk...</source>
-        <translation type="vanished">Зняти частину латки...</translation>
-    </message>
-    <message>
-        <source>Unable to Paste</source>
-        <translation type="vanished">Неможливо вставити</translation>
-    </message>
-    <message>
-        <source>Code pasting services are not available.</source>
-        <translation type="vanished">Служби вставки коду не доступні.</translation>
-    </message>
-    <message>
-        <source>Revert Chunk</source>
-        <translation type="vanished">Зняття частини латки</translation>
-    </message>
-    <message>
-        <source>Apply Chunk</source>
-        <translation type="vanished">Накладання частини латки</translation>
-    </message>
-    <message>
-        <source>Would you like to revert the chunk?</source>
-        <translation type="vanished">Бажаєте зняти частину латки?</translation>
-    </message>
-    <message>
-        <source>Would you like to apply the chunk?</source>
-        <translation type="vanished">Бажаєте накласти частину латки?</translation>
-    </message>
-</context>
 <context>
     <name>::Ios</name>
 </context>
@@ -37363,51 +37228,7 @@ Install an SDK of at least API version %1.</source>
     </message>
 </context>
 <context>
-    <name>DiffEditor::UnifiedDiffEditorWidget</name>
+    <name>::DiffEditor</name>
-    <message>
-        <source>No controller</source>
-        <translation type="vanished">Відсутній контролер</translation>
-    </message>
-    <message>
-        <source>Send Chunk to CodePaster...</source>
-        <translation type="vanished">Надіслати шматочок до Codepaster...</translation>
-    </message>
-    <message>
-        <source>Apply Chunk...</source>
-        <translation type="vanished">Накласти частину латки...</translation>
-    </message>
-    <message>
-        <source>Revert Chunk...</source>
-        <translation type="vanished">Зняти частину латки...</translation>
-    </message>
-    <message>
-        <source>Unable to Paste</source>
-        <translation type="vanished">Неможливо вставити</translation>
-    </message>
-    <message>
-        <source>Code pasting services are not available.</source>
-        <translation type="vanished">Служби вставки коду не доступні.</translation>
-    </message>
-    <message>
-        <source>Revert Chunk</source>
-        <translation type="vanished">Зняття частини латки</translation>
-    </message>
-    <message>
-        <source>Apply Chunk</source>
-        <translation type="vanished">Накладання частини латки</translation>
-    </message>
-    <message>
-        <source>Would you like to revert the chunk?</source>
-        <translation type="vanished">Бажаєте зняти частину латки?</translation>
-    </message>
-    <message>
-        <source>Would you like to apply the chunk?</source>
-        <translation type="vanished">Бажаєте накласти частину латки?</translation>
-    </message>
-    <message>
-        <source>No difference</source>
-        <translation type="vanished">Немає відмінностей</translation>
-    </message>
 </context>
 <context>
     <name>EmacsKeys::Internal::EmacsKeysPlugin</name>
@@ -41723,7 +41544,7 @@ Setting breakpoints by file name and line number may fail.</source>
     </message>
 </context>
 <context>
-    <name>DiffEditor::Internal::DiffEditor</name>
+    <name>::DiffEditor</name>
     <message>
         <source>Context lines:</source>
         <translation>Контекстні рядки:</translation>
@@ -41756,23 +41577,14 @@ Setting breakpoints by file name and line number may fail.</source>
         <source>Show Change Description</source>
         <translation>Показати опис зміни</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorDocument</name>
     <message>
         <source>Could not parse patch file &quot;%1&quot;. The content is not of unified diff format.</source>
         <translation>Не вдалось розібрати файл латки &quot;%1&quot;. Зміст не в форматі &quot;уніфікований diff&quot;.</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::UnifiedView</name>
     <message>
         <source>Switch to Unified Diff Editor</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::UnifiedView</name>
     <message>
         <source>Waiting for data...</source>
         <translation>Очікування на дані...</translation>
@@ -41781,31 +41593,14 @@ Setting breakpoints by file name and line number may fail.</source>
         <source>Failed</source>
         <translation>Збій</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::SideBySideView</name>
     <message>
         <source>Switch to Side By Side Diff Editor</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideBySideView</name>
     <message>
         <source>Synchronize Horizontal Scroll Bars</source>
         <translation>Синхронізувати горизонтальні смуги прокрутки</translation>
     </message>
-    <message>
-        <source>Waiting for data...</source>
-        <translation>Очікування на дані...</translation>
-    </message>
-    <message>
-        <source>Failed</source>
-        <translation>Збій</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideBySideDiffEditorWidget</name>
     <message numerus="yes">
         <source>Skipped %n lines...</source>
         <translation>
@@ -41838,14 +41633,6 @@ Setting breakpoints by file name and line number may fail.</source>
         <source>Revert Chunk...</source>
         <translation>Зняти частину латки...</translation>
     </message>
-    <message>
-        <source>Unable to Paste</source>
-        <translation type="vanished">Неможливо вставити</translation>
-    </message>
-    <message>
-        <source>Code pasting services are not available.</source>
-        <translation type="vanished">Служби вставки коду не доступні.</translation>
-    </message>
     <message>
         <source>Revert Chunk</source>
         <translation>Зняття частини латки</translation>
@@ -41862,56 +41649,14 @@ Setting breakpoints by file name and line number may fail.</source>
         <source>Would you like to apply the chunk?</source>
         <translation>Бажаєте накласти частину латки?</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideDiffEditorWidget</name>
     <message>
         <source>[%1] %2</source>
         <translation>[%1] %2</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::UnifiedDiffEditorWidget</name>
     <message>
         <source>No document</source>
         <translation>Немає документа</translation>
     </message>
-    <message>
-        <source>Send Chunk to CodePaster...</source>
-        <translation>Надіслати шматочок до Codepaster...</translation>
-    </message>
-    <message>
-        <source>Apply Chunk...</source>
-        <translation>Накласти частину латки...</translation>
-    </message>
-    <message>
-        <source>Revert Chunk...</source>
-        <translation>Зняти частину латки...</translation>
-    </message>
-    <message>
-        <source>Unable to Paste</source>
-        <translation type="vanished">Неможливо вставити</translation>
-    </message>
-    <message>
-        <source>Code pasting services are not available.</source>
-        <translation type="vanished">Служби вставки коду не доступні.</translation>
-    </message>
-    <message>
-        <source>Revert Chunk</source>
-        <translation>Зняття частини латки</translation>
-    </message>
-    <message>
-        <source>Apply Chunk</source>
-        <translation>Накладання частини латки</translation>
-    </message>
-    <message>
-        <source>Would you like to revert the chunk?</source>
-        <translation>Бажаєте зняти частину латки?</translation>
-    </message>
-    <message>
-        <source>Would you like to apply the chunk?</source>
-        <translation>Бажаєте накласти частину латки?</translation>
-    </message>
     <message>
         <source>No difference.</source>
         <translation>Немає відмінностей.</translation>

share/qtcreator/translations/qtcreator_zh_CN.ts

@@ -18047,9 +18047,6 @@ Rebuilding the project might help.</source>
         <source>Diff Editor</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffCurrentFileController</name>
     <message>
         <source>Saved</source>
         <translation type="unfinished"></translation>
@@ -18058,9 +18055,6 @@ Rebuilding the project might help.</source>
         <source>Modified</source>
         <translation type="unfinished">已更改</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditor</name>
     <message>
         <source>Context lines:</source>
         <translation type="unfinished"></translation>
@@ -18093,16 +18087,10 @@ Rebuilding the project might help.</source>
         <source>Show Change Description</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorDocument</name>
     <message>
         <source>Could not parse patch file &quot;%1&quot;. The content is not of unified diff format.</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorPlugin</name>
     <message>
         <source>&amp;Diff</source>
         <translation type="unfinished">&amp;Diff</translation>
@@ -18151,9 +18139,6 @@ Rebuilding the project might help.</source>
         <source>Diff &quot;%1&quot;, &quot;%2&quot;</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorServiceImpl</name>
     <message>
         <source>Diff Files</source>
         <translation type="unfinished"></translation>
@@ -18162,9 +18147,6 @@ Rebuilding the project might help.</source>
         <source>Diff Modified Files</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffEditorWidgetController</name>
     <message>
         <source>Send Chunk to CodePaster...</source>
         <translation type="unfinished"></translation>
@@ -18185,38 +18167,10 @@ Rebuilding the project might help.</source>
         <source>Select Encoding</source>
         <translation type="unfinished">选择编码</translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffFilesController</name>
     <message>
         <source>Calculating diff</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffModifiedFilesController</name>
-    <message>
-        <source>Saved</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modified</source>
-        <translation type="unfinished">已更改</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::DiffOpenFilesController</name>
-    <message>
-        <source>Saved</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Modified</source>
-        <translation type="unfinished">已更改</translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideBySideDiffEditorWidget</name>
     <message numerus="yes">
         <source>Skipped %n lines...</source>
         <translation type="unfinished">
@@ -18247,72 +18201,22 @@ Rebuilding the project might help.</source>
         <source>Rendering diff</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideBySideView</name>
     <message>
         <source>Synchronize Horizontal Scroll Bars</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Waiting for data...</source>
-        <translation type="unfinished">等待数据...</translation>
-    </message>
-    <message>
-        <source>Retrieving data failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::SideDiffEditorWidget</name>
     <message>
         <source>[%1] %2</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::UnifiedDiffEditorWidget</name>
     <message>
         <source>No document</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Waiting for data...</source>
-        <translation type="unfinished">等待数据...</translation>
-    </message>
-    <message>
-        <source>No difference.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Retrieving data failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rendering diff</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::Internal::UnifiedView</name>
-    <message>
-        <source>Waiting for data...</source>
-        <translation type="unfinished">等待数据...</translation>
-    </message>
-    <message>
-        <source>Retrieving data failed.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DiffEditor::SideBySideView</name>
     <message>
         <source>Switch to Side By Side Diff Editor</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>DiffEditor::UnifiedView</name>
     <message>
         <source>Switch to Unified Diff Editor</source>
         <translation type="unfinished"></translation>

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 <coreplugin/coreconstants.h>
@@ -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 = m_toolBar->addAction(Utils::Icons::RELOAD_TOOLBAR.icon(), Tr::tr("Reload Diff"));
-    m_reloadAction->setToolTip(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")
+    const QString actionText = m_showDescription ? Tr::tr("Hide Change Description")
-                                                 : tr("Show Change Description");
+                                                 : Tr::tr("Show Change Description");
     GuardLocker guard(m_ignoreChanges);
     m_toggleDescriptionAction->setChecked(m_showDescription);
     m_toggleDescriptionAction->setToolTip(actionText);

src/plugins/diffeditor/diffeditordocument.cpp

@@ -4,6 +4,7 @@
 #include "diffeditordocument.h"
 #include "diffeditorconstants.h"
 #include "diffeditorcontroller.h"
+#include "diffeditortr.h"
 
 #include <utils/fileutils.h>
 #include <utils/qtcassert.h>
@@ -292,7 +293,7 @@ Core::IDocument::OpenResult DiffEditorDocument::open(QString *errorString, const
     bool ok = false;
     QList<FileData> fileDataList = DiffUtils::readPatch(patch, &ok);
     if (!ok) {
-        *errorString = tr("Could not parse patch file \"%1\". "
+        *errorString = Tr::tr("Could not parse patch file \"%1\". "
                               "The content is not of unified diff format.")
                 .arg(filePath.toUserOutput());
     } else {

src/plugins/diffeditor/diffeditorplugin.cpp

@@ -6,6 +6,7 @@
 #include "diffeditorcontroller.h"
 #include "diffeditordocument.h"
 #include "diffeditorfactory.h"
+#include "diffeditortr.h"
 
 #include <coreplugin/actionmanager/actioncontainer.h>
 #include <coreplugin/actionmanager/actionmanager.h>
@@ -105,7 +106,7 @@ protected:
 DiffFilesController::DiffFilesController(IDocument *document)
     : DiffEditorController(document)
 {
-    setDisplayName(tr("Diff"));
+    setDisplayName(Tr::tr("Diff"));
     using namespace Tasking;
 
     const TreeStorage<QList<FileData>> storage;
@@ -182,8 +183,8 @@ QList<ReloadInput> DiffCurrentFileController::reloadInputList() const
 
         ReloadInput reloadInput;
         reloadInput.text = {leftText, rightText};
-        reloadInput.fileInfo = {DiffFileInfo(m_fileName, tr("Saved")),
+        reloadInput.fileInfo = {DiffFileInfo(m_fileName, Tr::tr("Saved")),
-                                DiffFileInfo(m_fileName, tr("Modified"))};
+                                DiffFileInfo(m_fileName, Tr::tr("Modified"))};
         reloadInput.fileInfo[RightSide].patchBehaviour = DiffFileInfo::PatchEditor;
         reloadInput.binaryFiles = (leftResult == TextFileFormat::ReadEncodingError);
 
@@ -231,8 +232,8 @@ QList<ReloadInput> DiffOpenFilesController::reloadInputList() const
 
             ReloadInput reloadInput;
             reloadInput.text = {leftText, rightText};
-            reloadInput.fileInfo = {DiffFileInfo(fileName, tr("Saved")),
+            reloadInput.fileInfo = {DiffFileInfo(fileName, Tr::tr("Saved")),
-                                    DiffFileInfo(fileName, tr("Modified"))};
+                                    DiffFileInfo(fileName, Tr::tr("Modified"))};
             reloadInput.fileInfo[RightSide].patchBehaviour = DiffFileInfo::PatchEditor;
             reloadInput.binaryFiles = (leftResult == TextFileFormat::ReadEncodingError);
 
@@ -284,8 +285,8 @@ QList<ReloadInput> DiffModifiedFilesController::reloadInputList() const
 
             ReloadInput reloadInput;
             reloadInput.text = {leftText, rightText};
-            reloadInput.fileInfo = {DiffFileInfo(fileName, tr("Saved")),
+            reloadInput.fileInfo = {DiffFileInfo(fileName, Tr::tr("Saved")),
-                                    DiffFileInfo(fileName, tr("Modified"))};
+                                    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<DiffExternalFilesController>(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<DiffModifiedFilesController>(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<DiffCurrentFileController>(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<DiffOpenFilesController>(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<DiffExternalFilesController>(documentId, title, filePath1.toString(), filePath2.toString());
 }
 

src/plugins/diffeditor/diffeditorwidgetcontroller.cpp

@@ -5,6 +5,7 @@
 #include "diffeditorconstants.h"
 #include "diffeditorcontroller.h"
 #include "diffeditordocument.h"
+#include "diffeditortr.h"
 
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
@@ -225,7 +226,7 @@ void DiffEditorWidgetController::addCodePasterAction(QMenu *menu, int fileIndex,
 {
     if (ExtensionSystem::PluginManager::getObject<CodePaster::Service>()) {
         // 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...")
+    const QString actionName = patchAction == PatchAction::Apply ? Tr::tr("Apply Chunk...")
-                                                                 : tr("Revert 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("<b>Error:</b> Could not decode \"%1\" with \"%2\"-encoding.")
+                                 Tr::tr("<b>Error:</b> 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);

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<FileData> &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",
+    setToolTip(Tr::tr("Switch to Side By Side Diff Editor"));
-                                           "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)

src/plugins/diffeditor/sidebysidediffeditorwidget.cpp

@@ -6,6 +6,7 @@
 #include "diffeditorconstants.h"
 #include "diffeditordocument.h"
 #include "diffeditorplugin.h"
+#include "diffeditortr.h"
 
 #include <QMenu>
 #include <QPainter>
@@ -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 Tr::tr("Binary files differ");
-    return SideBySideDiffEditorWidget::tr("Skipped unknown number of lines...");
+    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<FileData> &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)

src/plugins/diffeditor/unifieddiffeditorwidget.cpp

@@ -6,6 +6,7 @@
 #include "diffeditorconstants.h"
 #include "diffeditordocument.h"
 #include "diffeditorplugin.h"
+#include "diffeditortr.h"
 
 #include <QMenu>
 #include <QPainter>
@@ -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<FileData> &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<void> &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)