mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-03-01 07:13:22 +00:00
Code Issues Projects Releases Wiki Activity

Resolve merge conflicts from https://gitlab.com/OpenMW/openmw/-/merge_requests/3893

Browse Source
This commit is contained in:
AnyOldName3 2024-04-08 13:37:36 +01:00
parent 810e2c44a6
commit 0d547c5438
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/wizard/ui/importpage.ui
View File

@ -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,

6
files/lang/wizard_de.ts
View File

@ -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>

6
files/lang/wizard_fr.ts
View File

@ -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>

6
files/lang/wizard_ru.ts
View File

@ -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>