diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index 911bc0c3..ab836cb8 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -11958,115 +11958,115 @@ Please note, that you can not impersonate a disabled user. If you try you will g
       </segment>
     </unit>
     <unit id="2NZFail" name="collection_type.new_element.tooltip">
-      <segment>
+      <segment state="translated">
         <source>collection_type.new_element.tooltip</source>
         <target>This element was newly created and was not persisted to the database yet.</target>
       </segment>
     </unit>
     <unit id="USUaBZ0" name="part.merge.title">
-      <segment>
+      <segment state="translated">
         <source>part.merge.title</source>
         <target>Merge part</target>
       </segment>
     </unit>
     <unit id="sCLZTwA" name="part.merge.title.into">
-      <segment>
+      <segment state="translated">
         <source>part.merge.title.into</source>
         <target>into</target>
       </segment>
     </unit>
     <unit id="nISUoQl" name="part.merge.confirm.title">
-      <segment>
+      <segment state="translated">
         <source>part.merge.confirm.title</source>
-        <target><![CDATA[Do you really want to merge <b>%other%</b> into <b>%target%</b>?]]></target>
+        <target>Do you really want to merge &lt;b&gt;%other%&lt;/b&gt; into &lt;b&gt;%target%&lt;/b&gt;?</target>
       </segment>
     </unit>
     <unit id="qxHNYfX" name="part.merge.confirm.message">
-      <segment>
+      <segment state="translated">
         <source>part.merge.confirm.message</source>
-        <target><![CDATA[<b>%other%</b> will be deleted, and the part will be saved with the shown information.]]></target>
+        <target>&lt;b&gt;%other%&lt;/b&gt; will be deleted, and the part will be saved with the shown information.</target>
       </segment>
     </unit>
     <unit id="BY9.T4F" name="part.info.merge_modal.title">
-      <segment>
+      <segment state="translated">
         <source>part.info.merge_modal.title</source>
         <target>Merge parts</target>
       </segment>
     </unit>
     <unit id="CasQeyD" name="part.info.merge_modal.other_part">
-      <segment>
+      <segment state="translated">
         <source>part.info.merge_modal.other_part</source>
         <target>Other part</target>
       </segment>
     </unit>
     <unit id="96Qzc6H" name="part.info.merge_modal.other_into_this">
-      <segment>
+      <segment state="translated">
         <source>part.info.merge_modal.other_into_this</source>
         <target>Merge other part into this one (delete other part, keep this one)</target>
       </segment>
     </unit>
     <unit id="Oe4cpRH" name="part.info.merge_modal.this_into_other">
-      <segment>
+      <segment state="translated">
         <source>part.info.merge_modal.this_into_other</source>
         <target>Merge this part into other one (delete this part, keep other one)</target>
       </segment>
     </unit>
     <unit id="pO3q5CN" name="part.info.merge_btn">
-      <segment>
+      <segment state="translated">
         <source>part.info.merge_btn</source>
         <target>Merge part</target>
       </segment>
     </unit>
     <unit id="efgWRwB" name="part.update_part_from_info_provider.btn">
-      <segment>
+      <segment state="translated">
         <source>part.update_part_from_info_provider.btn</source>
         <target>Update part from info providers</target>
       </segment>
     </unit>
     <unit id="n6_Ec0h" name="info_providers.update_part.title">
-      <segment>
+      <segment state="translated">
         <source>info_providers.update_part.title</source>
         <target>Update existing part from info provider</target>
       </segment>
     </unit>
     <unit id="lkIVIWr" name="part.merge.flash.please_review">
-      <segment>
+      <segment state="translated">
         <source>part.merge.flash.please_review</source>
         <target>Data not saved yet. Review the changes and click save to persist the new data.</target>
       </segment>
     </unit>
     <unit id="0nL5IhK" name="user.edit.flash.permissions_fixed">
-      <segment>
+      <segment state="translated">
         <source>user.edit.flash.permissions_fixed</source>
         <target>Permissions required by other permissions were missing. This was corrected. Please check if the permissions are as you intended.</target>
       </segment>
     </unit>
     <unit id="gjo2ZK7" name="permission.legend.dependency_note">
-      <segment>
+      <segment state="translated">
         <source>permission.legend.dependency_note</source>
         <target>Please note that some permission operations depend on each other. If you encounter a warning that missing permissions were corrected and a permission was set to allow again, you have to set the dependent operation to forbid too. The dependents can normally found right of an operation.</target>
       </segment>
     </unit>
     <unit id="VFdWqOX" name="log.part_stock_changed.timestamp">
-      <segment>
+      <segment state="translated">
         <source>log.part_stock_changed.timestamp</source>
         <target>Timestamp</target>
       </segment>
     </unit>
     <unit id="Hj7NX8C" name="part.info.withdraw_modal.timestamp">
-      <segment>
+      <segment state="translated">
         <source>part.info.withdraw_modal.timestamp</source>
         <target>Action timestamp</target>
       </segment>
     </unit>
     <unit id="USYGK0J" name="part.info.withdraw_modal.timestamp.hint">
-      <segment>
+      <segment state="translated">
         <source>part.info.withdraw_modal.timestamp.hint</source>
         <target>This field allows you to specify the real date, when the stock operation actually was performed, and not just when it was logged. This value is saved in the extra field of the log entry.</target>
       </segment>
     </unit>
     <unit id="GIR36qJ" name="part.info.withdraw_modal.delete_lot_if_empty">
-      <segment>
+      <segment state="translated">
         <source>part.info.withdraw_modal.delete_lot_if_empty</source>
         <target>Delete this lot, if it becomes empty</target>
       </segment>