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

Merge conflict resolution part II

Browse Source
This commit is contained in:
AnyOldName3 2024-04-07 22:34:17 +01:00
parent 48f1f08537
commit 810e2c44a6
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/lang/wizard_de.ts
View File

@ -514,11 +514,11 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>Error writing OpenMW configuration file</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not create %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message> <message>
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not create %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>Error writing OpenMW configuration file</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
</context> </context>

8
files/lang/wizard_fr.ts
View File

@ -505,10 +505,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
<source>Quit Wizard</source> <source>Quit Wizard</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Error writing OpenMW configuration file</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Are you sure you want to exit the Wizard?</source> <source>Are you sure you want to exit the Wizard?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
@ -521,6 +517,10 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
<source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not create %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source> <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;b&gt;Could not create %1&lt;/b&gt;&lt;/p&gt;&lt;p&gt;Please make sure you have the right permissions and try again.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Error writing OpenMW configuration file</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>Wizard::UnshieldWorker</name> <name>Wizard::UnshieldWorker</name>