From d46d196a8c7b2507f33f9a5462537123869a7766 Mon Sep 17 00:00:00 2001
From: Alessandro Portale <alessandro.portale@qt.io>
Date: Wed, 1 Feb 2023 19:34:49 +0100
Subject: [PATCH] QmlEditorWidgets: Merge orphaned .ts contexts into
 "::QmlEditorWidgets"

Following orphaned contexts are merged into ::QmlEditorWidgets

  ContextPaneTextWidget
  ContextPaneWidgetBorderImage
  ContextPaneWidgetImage
  ContextPaneWidgetRectangle
  EasingContextPane
  FileWidget
  QmlEditorWidgets::ContextPaneWidgetImage
  QmlEditorWidgets::ContextPaneWidget
  QmlEditorWidgets::FileWidget

Change-Id: I6d123076fc836951e65df17748560663215d4ebe
Reviewed-by: hjk <hjk@qt.io>
---
 share/qtcreator/translations/qtcreator_cs.ts  | 43 ++-----------------
 share/qtcreator/translations/qtcreator_fr.ts  |  7 ---
 share/qtcreator/translations/qtcreator_sl.ts  |  6 +--
 share/qtcreator/translations/qtcreator_uk.ts  |  7 ---
 .../qtcreator/translations/qtcreator_zh_TW.ts |  6 +--
 5 files changed, 6 insertions(+), 63 deletions(-)

diff --git a/share/qtcreator/translations/qtcreator_cs.ts b/share/qtcreator/translations/qtcreator_cs.ts
index a140f4dc515..40c968b7040 100644
--- a/share/qtcreator/translations/qtcreator_cs.ts
+++ b/share/qtcreator/translations/qtcreator_cs.ts
@@ -23513,7 +23513,7 @@ Proces Pdb po určité době od úspěšného spuštění spadl.</translation>
     </message>
 </context>
 <context>
-    <name>FileWidget</name>
+    <name>::QmlEditorWidgets</name>
     <message>
         <source>Open File</source>
         <translation>Otevřít soubor</translation>
@@ -25119,7 +25119,7 @@ Vybere pro napodobovatele a přenosné cíle vhodné verze Qt, jsou-li dostupné
     </message>
 </context>
 <context>
-    <name>ContextPaneTextWidget</name>
+    <name>::QmlEditorWidgets</name>
     <message>
         <source>Text</source>
         <translation>Text</translation>
@@ -25157,7 +25157,7 @@ Vybere pro napodobovatele a přenosné cíle vhodné verze Qt, jsou-li dostupné
     </message>
 </context>
 <context>
-    <name>ContextPaneWidgetBorderImage</name>
+    <name>::QmlEditorWidgets</name>
     <message>
         <source>Form</source>
         <translation>Formulář</translation>
@@ -25186,13 +25186,6 @@ Vybere pro napodobovatele a přenosné cíle vhodné verze Qt, jsou-li dostupné
         <source>10 x 10</source>
         <translation>10 x 10</translation>
     </message>
-</context>
-<context>
-    <name>ContextPaneWidgetImage</name>
-    <message>
-        <source>Form</source>
-        <translation>Formulář</translation>
-    </message>
     <message>
         <source>The image is scaled to fit</source>
         <translation>Velikost obrázku je změněna tak, že vyplní plochu</translation>
@@ -25217,10 +25210,6 @@ Vybere pro napodobovatele a přenosné cíle vhodné verze Qt, jsou-li dostupné
         <source>The image is scaled uniformly to fill, cropping if necessary</source>
         <translation>Velikost obrázku je změněna rovnoměrně, ořezání, pokud je potřeba</translation>
     </message>
-    <message>
-        <source>10 x 10</source>
-        <translation>10 x 10</translation>
-    </message>
     <message>
         <source>The image is scaled to fit.</source>
         <translation>Velikost obrázku je změněna tak, že vyplní plochu.</translation>
@@ -25245,13 +25234,6 @@ Vybere pro napodobovatele a přenosné cíle vhodné verze Qt, jsou-li dostupné
         <source>The image is scaled uniformly to fill, cropping if necessary.</source>
         <translation>Velikost obrázku je změněna rovnoměrně, ořezání, pokud je potřeba.</translation>
     </message>
-</context>
-<context>
-    <name>ContextPaneWidgetRectangle</name>
-    <message>
-        <source>Form</source>
-        <translation>Formulář</translation>
-    </message>
     <message>
         <source>Gradient</source>
         <translation>Přechod</translation>
@@ -25260,17 +25242,10 @@ Vybere pro napodobovatele a přenosné cíle vhodné verze Qt, jsou-li dostupné
         <source>Color</source>
         <translation>Barva</translation>
     </message>
-    <message>
-        <source>...</source>
-        <translation>...</translation>
-    </message>
     <message>
         <source>Border</source>
         <translation>Okraj</translation>
     </message>
-</context>
-<context>
-    <name>EasingContextPane</name>
     <message>
         <source>Dialog</source>
         <translation>Dialog</translation>
@@ -28427,7 +28402,7 @@ With cache simulation, further event counters are enabled:
     </message>
 </context>
 <context>
-    <name>QmlEditorWidgets::ContextPaneWidget</name>
+    <name>::QmlEditorWidgets</name>
     <message>
         <source>Hides this toolbar.</source>
         <translation>Skryje tento panel nástrojů.</translation>
@@ -28448,9 +28423,6 @@ With cache simulation, further event counters are enabled:
         <source>Hides this toolbar. This toolbar can be permanently disabled in the options page or in the context menu.</source>
         <translation>Skryje tento panel nástrojů. Tento panel může být v nastavení nebo v kontextové nabídce trvale zakázán.</translation>
     </message>
-</context>
-<context>
-    <name>QmlEditorWidgets::ContextPaneWidgetImage</name>
     <message>
         <source>double click for preview</source>
         <translation>Dvojité klepnutí pro náhled</translation>
@@ -28460,13 +28432,6 @@ With cache simulation, further event counters are enabled:
         <translation>Dvojité klepnutí pro náhled.</translation>
     </message>
 </context>
-<context>
-    <name>QmlEditorWidgets::FileWidget</name>
-    <message>
-        <source>Open File</source>
-        <translation>Otevřít soubor</translation>
-    </message>
-</context>
 <context>
     <name>::QmlJS</name>
     <message>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index 10249b0f0f4..edb3c0ec23e 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -22532,13 +22532,6 @@ avec un mot de passe, que vous pouvez renseigner ci-dessus.</translation>
         <translation type="obsolete">Propriétés</translation>
     </message>
 </context>
-<context>
-    <name>FileWidget</name>
-    <message>
-        <source>Open File</source>
-        <translation>Ouvrir un fichier</translation>
-    </message>
-</context>
 <context>
     <name>QmlDesigner::PropertyEditor</name>
     <message>
diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts
index 6c149b536dc..641ef808608 100644
--- a/share/qtcreator/translations/qtcreator_sl.ts
+++ b/share/qtcreator/translations/qtcreator_sl.ts
@@ -15706,7 +15706,7 @@ cilj »%1«?</translation>
     </message>
 </context>
 <context>
-    <name>FileWidget</name>
+    <name>::QmlEditorWidgets</name>
     <message>
         <source>Open File</source>
         <translation>Odpri datoteko</translation>
@@ -20419,10 +20419,6 @@ S simulacijo predpomnilnika so omogočeni dodatni števci dogodkov:
         <source>double click for preview</source>
         <translation>Dvokliknite za ogled</translation>
     </message>
-    <message>
-        <source>Open File</source>
-        <translation>Odpri datoteko</translation>
-    </message>
 </context>
 <context>
     <name>::QmlJS</name>
diff --git a/share/qtcreator/translations/qtcreator_uk.ts b/share/qtcreator/translations/qtcreator_uk.ts
index 2ad19001395..d7c5e1fa948 100644
--- a/share/qtcreator/translations/qtcreator_uk.ts
+++ b/share/qtcreator/translations/qtcreator_uk.ts
@@ -7569,13 +7569,6 @@ will also disable the following plugins:
         <translation type="vanished">Інформація про FakeVim</translation>
     </message>
 </context>
-<context>
-    <name>FileWidget</name>
-    <message>
-        <source>Open File</source>
-        <translation type="vanished">Відкрити файл</translation>
-    </message>
-</context>
 <context>
     <name>FilterNameDialogClass</name>
     <message>
diff --git a/share/qtcreator/translations/qtcreator_zh_TW.ts b/share/qtcreator/translations/qtcreator_zh_TW.ts
index a3311d337a3..c96e05552ff 100644
--- a/share/qtcreator/translations/qtcreator_zh_TW.ts
+++ b/share/qtcreator/translations/qtcreator_zh_TW.ts
@@ -12957,7 +12957,7 @@ For qmlproject projects, use the importPaths property to add import paths.</sour
     </message>
 </context>
 <context>
-    <name>FileWidget</name>
+    <name>::QmlEditorWidgets</name>
     <message>
         <source>Open File</source>
         <translation>開啟檔案</translation>
@@ -14872,10 +14872,6 @@ Ids must begin with a lowercase letter.</source>
         <source>double click for preview</source>
         <translation>雙擊以預覽</translation>
     </message>
-    <message>
-        <source>Open File</source>
-        <translation>開啟檔案</translation>
-    </message>
 </context>
 <context>
     <name>::QmlJS</name>