diff --git a/src/DataTables/AttachmentDataTable.php b/src/DataTables/AttachmentDataTable.php
index 04299ca9..7973bf8a 100644
--- a/src/DataTables/AttachmentDataTable.php
+++ b/src/DataTables/AttachmentDataTable.php
@@ -117,7 +117,7 @@ final class AttachmentDataTable implements DataTableTypeInterface
         ]);
 
         $dataTable->add('internal_link', TextColumn::class, [
-            'label' => 'Internal copy', #TODO: translation
+            'label' => 'attachment.table.internal_file',
             'propertyPath' => 'filename',
             'render' => function ($value, Attachment $context) {
                 if ($this->attachmentHelper->isInternalFileExisting($context)) {
@@ -133,7 +133,7 @@ final class AttachmentDataTable implements DataTableTypeInterface
         ]);
 
         $dataTable->add('external_link', TextColumn::class, [
-            'label' => 'External copy', #TODO: translation
+            'label' => 'attachment.table.external_link',
             'propertyPath' => 'host',
             'render' => function ($value, Attachment $context) {
                 if ($context->hasExternal()) {
@@ -156,7 +156,7 @@ final class AttachmentDataTable implements DataTableTypeInterface
                         '<span class="badge bg-primary">
                         <i class="fas fa-globe fa-fw"></i>%s
                         </span>',
-                        $this->translator->trans('attachment.external')
+                        $this->translator->trans('attachment.external_only')
                     );
                 }
 
diff --git a/templates/parts/edit/edit_form_styles.html.twig b/templates/parts/edit/edit_form_styles.html.twig
index 084c073e..1175e32c 100644
--- a/templates/parts/edit/edit_form_styles.html.twig
+++ b/templates/parts/edit/edit_form_styles.html.twig
@@ -158,7 +158,7 @@
                     <br><br>
                     <h6>
                         <span class="badge bg-primary">
-                            <i class="fas fa-fw fa-globe"></i> {% trans %}attachment.external{% endtrans %}
+                            <i class="fas fa-fw fa-globe"></i> {% trans %}attachment.external_only{% endtrans %}
                         </span>
                     </h6>
                 {% elseif attachment_manager.isInternalFileExisting(attach) %}
diff --git a/templates/parts/info/_attachments_info.html.twig b/templates/parts/info/_attachments_info.html.twig
index cc3ede5f..58abdfd8 100644
--- a/templates/parts/info/_attachments_info.html.twig
+++ b/templates/parts/info/_attachments_info.html.twig
@@ -31,7 +31,7 @@
             <td class="align-middle h6">
                 {% if not attachment.hasInternal() %}
                     <span class="badge bg-primary">
-                            <i class="fas fa-fw fa-globe"></i> {% trans %}attachment.external{% endtrans %}
+                            <i class="fas fa-fw fa-globe"></i> {% trans %}attachment.external_only{% endtrans %}
                         </span>
                 {% elseif attachment_manager.internalFileExisting(attachment) %}
                     <span class="badge bg-secondary">
@@ -63,12 +63,12 @@
                     </a>
                     <a {% if attachment_manager.isInternalFileExisting(attachment) %}href="{{ entity_url(attachment, 'file_view') }}"{% endif %} target="_blank"
                        class="btn btn-secondary {% if not attachment_manager.isInternalFileExisting(attachment) or (attachment.secure and not is_granted("show_private", attachment))  %}disabled{% endif %}"
-                       data-turbo="false" title="{% trans %}attachment.view{% endtrans %}" rel="noopener">
+                       data-turbo="false" title="{% trans %}attachment.view_local{% endtrans %}" rel="noopener">
                         <i class="fas fa-eye fa-fw"></i>
                     </a>
                     <a {% if attachment_manager.isInternalFileExisting(attachment)  %}href="{{ entity_url(attachment, 'file_download') }}"{% endif %} data-turbo="false"
                        class="btn btn-secondary {% if not attachment_manager.isInternalFileExisting(attachment) or (attachment.secure and not is_granted("show_private", attachment)) %}disabled{% endif %}"
-                       title="{% trans %}attachment.download{% endtrans %}">
+                       title="{% trans %}attachment.download_local{% endtrans %}">
                         <i class="fas fa-download fa-fw"></i>
                     </a>
 
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index e1c19d7c..e3c435bc 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -242,7 +242,7 @@
       </notes>
       <segment state="final">
         <source>part.info.timetravel_hint</source>
-        <target>This is how the part appeared before %timestamp%. &lt;i&gt;Please note that this feature is experimental, so the info may not be correct.&lt;/i&gt;</target>
+        <target><![CDATA[This is how the part appeared before %timestamp%. <i>Please note that this feature is experimental, so the info may not be correct.</i>]]></target>
       </segment>
     </unit>
     <unit id="3exvSpl" name="standard.label">
@@ -731,10 +731,10 @@
       </notes>
       <segment state="translated">
         <source>user.edit.tfa.disable_tfa_message</source>
-        <target>This will disable &lt;b&gt;all active two-factor authentication methods of the user&lt;/b&gt; and delete the &lt;b&gt;backup codes&lt;/b&gt;!
-&lt;br&gt;
-The user will have to set up all two-factor authentication methods again and print new backup codes! &lt;br&gt;&lt;br&gt;
-&lt;b&gt;Only do this if you are absolutely sure about the identity of the user (seeking help), otherwise the account could be compromised by an attacker!&lt;/b&gt;</target>
+        <target><![CDATA[This will disable <b>all active two-factor authentication methods of the user</b> and delete the <b>backup codes</b>!
+<br>
+The user will have to set up all two-factor authentication methods again and print new backup codes! <br><br>
+<b>Only do this if you are absolutely sure about the identity of the user (seeking help), otherwise the account could be compromised by an attacker!</b>]]></target>
       </segment>
     </unit>
     <unit id="APsHYu0" name="user.edit.tfa.disable_tfa.btn">
@@ -780,17 +780,9 @@ The user will have to set up all two-factor authentication methods again and pri
         <target>Delete</target>
       </segment>
     </unit>
-    <unit id="W80Gv6o" name="attachment.external">
-      <notes>
-        <note category="file-source" priority="1">Part-DB1\templates\AdminPages\_attachments.html.twig:41</note>
-        <note category="file-source" priority="1">Part-DB1\templates\Parts\edit\_attachments.html.twig:38</note>
-        <note category="file-source" priority="1">Part-DB1\templates\Parts\info\_attachments_info.html.twig:35</note>
-        <note category="file-source" priority="1">Part-DB1\src\DataTables\AttachmentDataTable.php:159</note>
-        <note priority="1">Part-DB1\templates\Parts\edit\_attachments.html.twig:38</note>
-        <note priority="1">Part-DB1\src\DataTables\AttachmentDataTable.php:159</note>
-      </notes>
+    <unit id="FtktoBj" name="attachment.external_only">
       <segment state="translated">
-        <source>attachment.external</source>
+        <source>attachment.external_only</source>
         <target>External only</target>
       </segment>
     </unit>
@@ -806,7 +798,7 @@ The user will have to set up all two-factor authentication methods again and pri
         <target>Attachment thumbnail</target>
       </segment>
     </unit>
-    <unit id="fCQby7u" name="attachment.view">
+    <unit id="I_HDnsL" name="attachment.view_local">
       <notes>
         <note category="file-source" priority="1">Part-DB1\templates\AdminPages\_attachments.html.twig:52</note>
         <note category="file-source" priority="1">Part-DB1\templates\Parts\edit\_attachments.html.twig:50</note>
@@ -816,7 +808,7 @@ The user will have to set up all two-factor authentication methods again and pri
         <note priority="1">Part-DB1\templates\Parts\info\_attachments_info.html.twig:45</note>
       </notes>
       <segment state="translated">
-        <source>attachment.view</source>
+        <source>attachment.view_local</source>
         <target>View Local Copy</target>
       </segment>
     </unit>
@@ -893,9 +885,9 @@ The user will have to set up all two-factor authentication methods again and pri
       </notes>
       <segment state="translated">
         <source>entity.delete.message</source>
-        <target>This can not be undone!
-&lt;br&gt;
-Sub elements will be moved upwards.</target>
+        <target><![CDATA[This can not be undone!
+<br>
+Sub elements will be moved upwards.]]></target>
       </segment>
     </unit>
     <unit id="2tKAqHw" name="entity.delete">
@@ -1449,7 +1441,7 @@ Sub elements will be moved upwards.</target>
       </notes>
       <segment state="final">
         <source>homepage.github.text</source>
-        <target>Source, downloads, bug reports, to-do-list etc. can be found on &lt;a href="%href%" class="link-external" target="_blank"&gt;GitHub project page&lt;/a&gt;</target>
+        <target><![CDATA[Source, downloads, bug reports, to-do-list etc. can be found on <a href="%href%" class="link-external" target="_blank">GitHub project page</a>]]></target>
       </segment>
     </unit>
     <unit id="D5OKsgU" name="homepage.help.caption">
@@ -1471,7 +1463,7 @@ Sub elements will be moved upwards.</target>
       </notes>
       <segment state="translated">
         <source>homepage.help.text</source>
-        <target>Help and tips can be found in Wiki the &lt;a href="%href%" class="link-external" target="_blank"&gt;GitHub page&lt;/a&gt;</target>
+        <target><![CDATA[Help and tips can be found in Wiki the <a href="%href%" class="link-external" target="_blank">GitHub page</a>]]></target>
       </segment>
     </unit>
     <unit id="dnirx4v" name="homepage.forum.caption">
@@ -1713,7 +1705,7 @@ Sub elements will be moved upwards.</target>
       </notes>
       <segment state="translated">
         <source>email.pw_reset.fallback</source>
-        <target>If this does not work for you, go to &lt;a href="%url%"&gt;%url%&lt;/a&gt; and enter the following info</target>
+        <target><![CDATA[If this does not work for you, go to <a href="%url%">%url%</a> and enter the following info]]></target>
       </segment>
     </unit>
     <unit id="DduL9Hu" name="email.pw_reset.username">
@@ -1743,7 +1735,7 @@ Sub elements will be moved upwards.</target>
       </notes>
       <segment state="translated">
         <source>email.pw_reset.valid_unit %date%</source>
-        <target>The reset token will be valid until &lt;i&gt;%date%&lt;/i&gt;.</target>
+        <target><![CDATA[The reset token will be valid until <i>%date%</i>.]]></target>
       </segment>
     </unit>
     <unit id="8sBnjRy" name="orderdetail.delete">
@@ -2119,13 +2111,13 @@ Sub elements will be moved upwards.</target>
         <target>Preview picture</target>
       </segment>
     </unit>
-    <unit id="O2kBcDz" name="attachment.download">
+    <unit id="Uuy6Ntl" name="attachment.download_local">
       <notes>
         <note category="file-source" priority="1">Part-DB1\templates\Parts\info\_attachments_info.html.twig:67</note>
         <note priority="1">Part-DB1\templates\Parts\info\_attachments_info.html.twig:50</note>
       </notes>
       <segment state="translated">
-        <source>attachment.download</source>
+        <source>attachment.download_local</source>
         <target>Download Local Copy</target>
       </segment>
     </unit>
@@ -3586,8 +3578,8 @@ Sub elements will be moved upwards.</target>
       </notes>
       <segment state="translated">
         <source>tfa_google.disable.confirm_message</source>
-        <target>If you disable the Authenticator App, all backup codes will be deleted, so you may need to reprint them.&lt;br&gt;
-Also note that without two-factor authentication, your account is no longer as well protected against attackers!</target>
+        <target><![CDATA[If you disable the Authenticator App, all backup codes will be deleted, so you may need to reprint them.<br>
+Also note that without two-factor authentication, your account is no longer as well protected against attackers!]]></target>
       </segment>
     </unit>
     <unit id="yu9MSt5" name="tfa_google.disabled_message">
@@ -3607,7 +3599,7 @@ Also note that without two-factor authentication, your account is no longer as w
       </notes>
       <segment state="translated">
         <source>tfa_google.step.download</source>
-        <target>Download an authenticator app (e.g. &lt;a class="link-external" target="_blank" href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2"&gt;Google Authenticator&lt;/a&gt; oder &lt;a class="link-external" target="_blank" href="https://play.google.com/store/apps/details?id=org.fedorahosted.freeotp"&gt;FreeOTP Authenticator&lt;/a&gt;)</target>
+        <target><![CDATA[Download an authenticator app (e.g. <a class="link-external" target="_blank" href="https://play.google.com/store/apps/details?id=com.google.android.apps.authenticator2">Google Authenticator</a> oder <a class="link-external" target="_blank" href="https://play.google.com/store/apps/details?id=org.fedorahosted.freeotp">FreeOTP Authenticator</a>)]]></target>
       </segment>
     </unit>
     <unit id="eriwJoR" name="tfa_google.step.scan">
@@ -3849,8 +3841,8 @@ Also note that without two-factor authentication, your account is no longer as w
       </notes>
       <segment state="translated">
         <source>tfa_trustedDevices.explanation</source>
-        <target>When checking the second factor, the current computer can be marked as trustworthy, so no more two-factor checks on this computer are needed.
-If you have done this incorrectly or if a computer is no longer trusted, you can reset the status of &lt;i&gt;all &lt;/i&gt;computers here.</target>
+        <target><![CDATA[When checking the second factor, the current computer can be marked as trustworthy, so no more two-factor checks on this computer are needed.
+If you have done this incorrectly or if a computer is no longer trusted, you can reset the status of <i>all </i>computers here.]]></target>
       </segment>
     </unit>
     <unit id="FZINq8z" name="tfa_trustedDevices.invalidate.confirm_title">
@@ -5321,7 +5313,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>label_options.lines_mode.help</source>
-        <target>If you select Twig here, the content field is interpreted as Twig template. See &lt;a href="https://twig.symfony.com/doc/3.x/templates.html"&gt;Twig documentation&lt;/a&gt; and &lt;a href="https://docs.part-db.de/usage/labels.html#twig-mode"&gt;Wiki&lt;/a&gt; for more information.</target>
+        <target><![CDATA[If you select Twig here, the content field is interpreted as Twig template. See <a href="https://twig.symfony.com/doc/3.x/templates.html">Twig documentation</a> and <a href="https://docs.part-db.de/usage/labels.html#twig-mode">Wiki</a> for more information.]]></target>
       </segment>
     </unit>
     <unit id="isvxbiX" name="label_options.page_size.label">
@@ -9396,25 +9388,25 @@ Element 3</target>
     <unit id="r4vDLAt" name="filter.parameter_value_constraint.operator.&lt;">
       <segment state="translated">
         <source>filter.parameter_value_constraint.operator.&lt;</source>
-        <target>Typ. Value &lt;</target>
+        <target><![CDATA[Typ. Value <]]></target>
       </segment>
     </unit>
     <unit id="X9SA3UP" name="filter.parameter_value_constraint.operator.&gt;">
       <segment state="translated">
         <source>filter.parameter_value_constraint.operator.&gt;</source>
-        <target>Typ. Value &gt;</target>
+        <target><![CDATA[Typ. Value >]]></target>
       </segment>
     </unit>
     <unit id="BQGaoQS" name="filter.parameter_value_constraint.operator.&lt;=">
       <segment state="translated">
         <source>filter.parameter_value_constraint.operator.&lt;=</source>
-        <target>Typ. Value &lt;=</target>
+        <target><![CDATA[Typ. Value <=]]></target>
       </segment>
     </unit>
     <unit id="2ha3P6g" name="filter.parameter_value_constraint.operator.&gt;=">
       <segment state="translated">
         <source>filter.parameter_value_constraint.operator.&gt;=</source>
-        <target>Typ. Value &gt;=</target>
+        <target><![CDATA[Typ. Value >=]]></target>
       </segment>
     </unit>
     <unit id="4DaBace" name="filter.parameter_value_constraint.operator.BETWEEN">
@@ -9522,7 +9514,7 @@ Element 3</target>
     <unit id="4tHhDtU" name="parts_list.search.searching_for">
       <segment state="translated">
         <source>parts_list.search.searching_for</source>
-        <target>Searching parts with keyword &lt;b&gt;%keyword%&lt;/b&gt;</target>
+        <target><![CDATA[Searching parts with keyword <b>%keyword%</b>]]></target>
       </segment>
     </unit>
     <unit id="4vomKLa" name="parts_list.search_options.caption">
@@ -10182,13 +10174,13 @@ Element 3</target>
     <unit id="NdZ1t7a" name="project.builds.number_of_builds_possible">
       <segment state="translated">
         <source>project.builds.number_of_builds_possible</source>
-        <target>You have enough stocked to build &lt;b&gt;%max_builds%&lt;/b&gt; builds of this project.</target>
+        <target><![CDATA[You have enough stocked to build <b>%max_builds%</b> builds of this project.]]></target>
       </segment>
     </unit>
     <unit id="iuSpPbg" name="project.builds.check_project_status">
       <segment state="translated">
         <source>project.builds.check_project_status</source>
-        <target>The current project status is &lt;b&gt;"%project_status%"&lt;/b&gt;. You should check if you really want to build the project with this status!</target>
+        <target><![CDATA[The current project status is <b>"%project_status%"</b>. You should check if you really want to build the project with this status!]]></target>
       </segment>
     </unit>
     <unit id="Y7vSSxi" name="project.builds.following_bom_entries_miss_instock_n">
@@ -10290,7 +10282,7 @@ Element 3</target>
     <unit id="GzqIwHH" name="entity.select.add_hint">
       <segment state="translated">
         <source>entity.select.add_hint</source>
-        <target>Use -&gt; to create nested structures, e.g. "Node 1-&gt;Node 1.1"</target>
+        <target><![CDATA[Use -> to create nested structures, e.g. "Node 1->Node 1.1"]]></target>
       </segment>
     </unit>
     <unit id="S4CxO.T" name="entity.select.group.new_not_added_to_DB">
@@ -10314,13 +10306,13 @@ Element 3</target>
     <unit id="XLnXtsR" name="homepage.first_steps.introduction">
       <segment state="translated">
         <source>homepage.first_steps.introduction</source>
-        <target>Your database is still empty. You might want to read the &lt;a href="%url%"&gt;documentation&lt;/a&gt; or start to creating the following data structures:</target>
+        <target><![CDATA[Your database is still empty. You might want to read the <a href="%url%">documentation</a> or start to creating the following data structures:]]></target>
       </segment>
     </unit>
     <unit id="Q79MOIk" name="homepage.first_steps.create_part">
       <segment state="translated">
         <source>homepage.first_steps.create_part</source>
-        <target>Or you can directly &lt;a href="%url%"&gt;create a new part&lt;/a&gt;.</target>
+        <target><![CDATA[Or you can directly <a href="%url%">create a new part</a>.]]></target>
       </segment>
     </unit>
     <unit id="vplYq4f" name="homepage.first_steps.hide_hint">
@@ -10332,7 +10324,7 @@ Element 3</target>
     <unit id="MJoZl4f" name="homepage.forum.text">
       <segment state="translated">
         <source>homepage.forum.text</source>
-        <target>For questions about Part-DB use the &lt;a href="%href%" class="link-external" target="_blank"&gt;discussion forum&lt;/a&gt;</target>
+        <target><![CDATA[For questions about Part-DB use the <a href="%href%" class="link-external" target="_blank">discussion forum</a>]]></target>
       </segment>
     </unit>
     <unit id="YsukbnK" name="log.element_edited.changed_fields.category">
@@ -10986,7 +10978,7 @@ Element 3</target>
     <unit id="p_IxB9K" name="parts.import.help_documentation">
       <segment state="translated">
         <source>parts.import.help_documentation</source>
-        <target>See the &lt;a href="%link%"&gt;documentation&lt;/a&gt; for more information on the file format.</target>
+        <target><![CDATA[See the <a href="%link%">documentation</a> for more information on the file format.]]></target>
       </segment>
     </unit>
     <unit id="awbvhVq" name="parts.import.help">
@@ -11166,7 +11158,7 @@ Element 3</target>
     <unit id="o5u.Nnz" name="part.filter.lessThanDesired">
       <segment state="translated">
         <source>part.filter.lessThanDesired</source>
-        <target>In stock less than desired (total amount &lt; min. amount)</target>
+        <target><![CDATA[In stock less than desired (total amount < min. amount)]]></target>
       </segment>
     </unit>
     <unit id="YN9eLcZ" name="part.filter.lotOwner">
@@ -11978,13 +11970,13 @@ Please note, that you can not impersonate a disabled user. If you try you will g
     <unit id="i68lU5x" name="part.merge.confirm.title">
       <segment state="translated">
         <source>part.merge.confirm.title</source>
-        <target>Do you really want to merge &lt;b&gt;%other%&lt;/b&gt; into &lt;b&gt;%target%&lt;/b&gt;?</target>
+        <target><![CDATA[Do you really want to merge <b>%other%</b> into <b>%target%</b>?]]></target>
       </segment>
     </unit>
     <unit id="k0anzYV" name="part.merge.confirm.message">
       <segment state="translated">
         <source>part.merge.confirm.message</source>
-        <target>&lt;b&gt;%other%&lt;/b&gt; will be deleted, and the part will be saved with the shown information.</target>
+        <target><![CDATA[<b>%other%</b> will be deleted, and the part will be saved with the shown information.]]></target>
       </segment>
     </unit>
     <unit id="mmW5Yl1" name="part.info.merge_modal.title">
@@ -12329,5 +12321,17 @@ Please note, that you can not impersonate a disabled user. If you try you will g
         <target>There are no entities to export!</target>
       </segment>
     </unit>
+    <unit id="0B3_rob" name="attachment.table.internal_file">
+      <segment>
+        <source>attachment.table.internal_file</source>
+        <target>Internal file</target>
+      </segment>
+    </unit>
+    <unit id="uhfLnkB" name="attachment.table.external_link">
+      <segment>
+        <source>attachment.table.external_link</source>
+        <target>External link</target>
+      </segment>
+    </unit>
   </file>
 </xliff>