Merge conflict resolution part II

files/lang/wizard_de.ts

@@ -514,11 +514,11 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <translation type="unfinished"></translation>
     </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>
     </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>
     </message>
 </context>

files/lang/wizard_fr.ts

@@ -505,10 +505,6 @@ to default Morrowind fonts. Check this box if you still prefer original fonts ov
         <source>Quit Wizard</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Error writing OpenMW configuration file</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Are you sure you want to exit the Wizard?</source>
         <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>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Error writing OpenMW configuration file</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>Wizard::UnshieldWorker</name>