From 0d547c54385c6eb7750e449aef6dc3fa812a863b Mon Sep 17 00:00:00 2001
From: AnyOldName3 <krizdjali@gmail.com>
Date: Mon, 8 Apr 2024 13:37:36 +0100
Subject: [PATCH] Resolve merge conflicts from
 https://gitlab.com/OpenMW/openmw/-/merge_requests/3893

---
 apps/wizard/ui/importpage.ui | 6 +++---
 files/lang/wizard_de.ts      | 6 +++---
 files/lang/wizard_fr.ts      | 6 +++---
 files/lang/wizard_ru.ts      | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/wizard/ui/importpage.ui b/apps/wizard/ui/importpage.ui
index acc0d268ec..669920c5f3 100644
--- a/apps/wizard/ui/importpage.ui
+++ b/apps/wizard/ui/importpage.ui
@@ -33,7 +33,7 @@
    <item>
     <widget class="QCheckBox" name="importCheckBox">
      <property name="text">
-      <string>Import settings from Morrowind.ini</string>
+      <string>Import Settings From Morrowind.ini</string>
      </property>
      <property name="checked">
       <bool>true</bool>
@@ -43,7 +43,7 @@
    <item>
     <widget class="QCheckBox" name="addonsCheckBox">
      <property name="text">
-      <string>Import add-on and plugin selection</string>
+      <string>Import Add-on and Plugin Selection</string>
      </property>
      <property name="checked">
       <bool>true</bool>
@@ -53,7 +53,7 @@
    <item>
     <widget class="QCheckBox" name="fontsCheckBox">
      <property name="text">
-      <string>Import bitmap fonts setup from Morrowind.ini</string>
+      <string>Import Bitmap Fonts Setup From Morrowind.ini</string>
      </property>
      <property name="toolTip">
       <string>Fonts shipped with the original engine are blurry with UI scaling and support only a small amount of characters,
diff --git a/files/lang/wizard_de.ts b/files/lang/wizard_de.ts
index 5749cf2d5d..33c7a5fb53 100644
--- a/files/lang/wizard_de.ts
+++ b/files/lang/wizard_de.ts
@@ -81,15 +81,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import settings from Morrowind.ini</source>
+        <source>Import Settings From Morrowind.ini</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import add-on and plugin selection</source>
+        <source>Import Add-on and Plugin Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import bitmap fonts setup from Morrowind.ini</source>
+        <source>Import Bitmap Fonts Setup From Morrowind.ini</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/files/lang/wizard_fr.ts b/files/lang/wizard_fr.ts
index 9b5acbc9e9..ab0b01af73 100644
--- a/files/lang/wizard_fr.ts
+++ b/files/lang/wizard_fr.ts
@@ -81,15 +81,15 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import settings from Morrowind.ini</source>
+        <source>Import Settings From Morrowind.ini</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import add-on and plugin selection</source>
+        <source>Import Add-on and Plugin Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Import bitmap fonts setup from Morrowind.ini</source>
+        <source>Import Bitmap Fonts Setup From Morrowind.ini</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
diff --git a/files/lang/wizard_ru.ts b/files/lang/wizard_ru.ts
index 0a2e6e5561..e26735443e 100644
--- a/files/lang/wizard_ru.ts
+++ b/files/lang/wizard_ru.ts
@@ -81,15 +81,15 @@
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Чтобы OpenMW мог работать правильно, ему нужно импортировать настройки из файла с настройками Morrowind.&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-weight:bold;&quot;&gt;Подсказка:&lt;/span&gt; Также можно импортировать настройки позже, запустив Мастер импорта заново.&lt;/p&gt;&lt;p/&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <source>Import settings from Morrowind.ini</source>
+        <source>Import Settings From Morrowind.ini</source>
         <translation>Импортировать настройки из Morrowind.ini</translation>
     </message>
     <message>
-        <source>Import add-on and plugin selection</source>
+        <source>Import Add-on and Plugin Selection</source>
         <translation>Импортировать список подключенных плагинов</translation>
     </message>
     <message>
-        <source>Import bitmap fonts setup from Morrowind.ini</source>
+        <source>Import Bitmap Fonts Setup From Morrowind.ini</source>
         <translation>Импортировать растровые шрифты из Morrowind.ini</translation>
     </message>
     <message>