From 2f3a6fff93cb7b70368fa16eddfae5ada10fa586 Mon Sep 17 00:00:00 2001
From: Eike Ziller <eike.ziller@qt.io>
Date: Wed, 19 Oct 2022 11:48:44 +0200
Subject: [PATCH] System settings: Fix translations after context change

The context unnecessarily changed from Core::Internal::SystemSettings
to Core::Internal::SystemSettingsWidget. Change it back.
Some translation were partially updated inbetween, remove duplicates
by prefering the new translations.

Amends dae9cb13cfd50317fb47461b5d0f60b05b40c36b
and b0847af740d388d53dacbeb1a69809a8596301f5

Change-Id: If604c5fa0f40d8f5ac273f01c189ffaf45b67811
Reviewed-by: hjk <hjk@qt.io>
---
 share/qtcreator/translations/qtcreator_de.ts |  6 +---
 share/qtcreator/translations/qtcreator_ja.ts | 30 +-------------------
 share/qtcreator/translations/qtcreator_ru.ts |  6 +---
 src/plugins/coreplugin/systemsettings.cpp    |  2 +-
 4 files changed, 4 insertions(+), 40 deletions(-)

diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 1fd70e622cb..5f624cbfe13 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -45411,7 +45411,7 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
     </message>
 </context>
 <context>
-    <name>Core::Internal::SystemSettingsWidget</name>
+    <name>Core::Internal::SystemSettings</name>
     <message>
         <source>Command line arguments used for &quot;%1&quot;.</source>
         <translation>Kommandozeilenargumente für &quot;%1&quot;.</translation>
@@ -45444,10 +45444,6 @@ Wenn Sie noch keinen privaten Schlüssel besitzen, können Sie hier auch einen e
         <source>Variables</source>
         <translation>Variablen</translation>
     </message>
-    <message>
-        <source>System</source>
-        <translation>System</translation>
-    </message>
 </context>
 <context>
     <name>Core::ListItemDelegate</name>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 7f212bbe547..5d84dd74efe 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -35870,10 +35870,6 @@ Android 5 ではローカルの Qt ライブラリをデプロイできません
 </context>
 <context>
     <name>Core::Internal::SystemSettings</name>
-    <message>
-        <source>System</source>
-        <translation>システム</translation>
-    </message>
     <message>
         <source>Terminal:</source>
         <translation>ターミナル:</translation>
@@ -35941,30 +35937,6 @@ Android 5 ではローカルの Qt ライブラリをデプロイできません
         <comment>Terminal</comment>
         <translation>既定に戻します。</translation>
     </message>
-    <message>
-        <source>Command used for reverting diff chunks.</source>
-        <translation>差分チャンクを元に戻す際に使用するコマンドです。</translation>
-    </message>
-    <message>
-        <source>Case Sensitive (Default)</source>
-        <translation>区別する (既定)</translation>
-    </message>
-    <message>
-        <source>Case Sensitive</source>
-        <translation>区別する</translation>
-    </message>
-    <message>
-        <source>Case Insensitive (Default)</source>
-        <translation>区別しない (既定)</translation>
-    </message>
-    <message>
-        <source>Case Insensitive</source>
-        <translation>区別しない</translation>
-    </message>
-    <message>
-        <source>Variables</source>
-        <translation>変数</translation>
-    </message>
     <message>
         <source>Warn before opening text files greater than</source>
         <translation>右記より大きなテキストファイルを開く際には警告する</translation>
@@ -48174,7 +48146,7 @@ Continue?</source>
     </message>
 </context>
 <context>
-    <name>Core::Internal::SystemSettingsWidget</name>
+    <name>Core::Internal::SystemSettings</name>
     <message>
         <source>Command line arguments used for &quot;%1&quot;.</source>
         <translation>&quot;%1&quot; に使用するコマンドライン引数。</translation>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 21f3707a4ca..5bdbc409b9f 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -11187,7 +11187,7 @@ Do you want to kill it?</source>
     </message>
 </context>
 <context>
-    <name>Core::Internal::SystemSettingsWidget</name>
+    <name>Core::Internal::SystemSettings</name>
     <message>
         <source>Command line arguments used for &quot;%1&quot;.</source>
         <translation>Параметры командной строки для «%1».</translation>
@@ -11220,10 +11220,6 @@ Do you want to kill it?</source>
         <source>Variables</source>
         <translation>Переменные</translation>
     </message>
-    <message>
-        <source>System</source>
-        <translation>Система</translation>
-    </message>
 </context>
 <context>
     <name>Core::Internal::ThemeChooser</name>
diff --git a/src/plugins/coreplugin/systemsettings.cpp b/src/plugins/coreplugin/systemsettings.cpp
index 82fbaee7dc4..1213812bd4a 100644
--- a/src/plugins/coreplugin/systemsettings.cpp
+++ b/src/plugins/coreplugin/systemsettings.cpp
@@ -65,7 +65,7 @@ static QString formatSize(qint64 size)
 
 class SystemSettingsWidget : public IOptionsPageWidget
 {
-    Q_DECLARE_TR_FUNCTIONS(Core::Internal::SystemSettingsWidget)
+    Q_DECLARE_TR_FUNCTIONS(Core::Internal::SystemSettings)
 
 public:
     SystemSettingsWidget()