diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index 917d2675..66f28483 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -19,7 +19,7 @@
       </notes>
       <segment state="translated">
         <source>attachment_type.edit</source>
-        <target>Edit file type</target>
+        <target>Edit [attachment_type]</target>
       </segment>
     </unit>
     <unit id="wyou6GD" name="attachment_type.new">
@@ -29,7 +29,7 @@
       </notes>
       <segment state="translated">
         <source>attachment_type.new</source>
-        <target>New file type</target>
+        <target>New [attachment_type]</target>
       </segment>
     </unit>
     <unit id="JHaxw0a" name="category.labelp">
@@ -84,7 +84,7 @@
       </notes>
       <segment state="translated">
         <source>category.edit</source>
-        <target>Edit category</target>
+        <target>Edit [category]</target>
       </segment>
     </unit>
     <unit id="6.rAXsX" name="category.new">
@@ -94,7 +94,7 @@
       </notes>
       <segment state="translated">
         <source>category.new</source>
-        <target>New category</target>
+        <target>New [category]</target>
       </segment>
     </unit>
     <unit id="KSFhj_3" name="currency.iso_code.caption">
@@ -124,7 +124,7 @@
       </notes>
       <segment state="translated">
         <source>currency.edit</source>
-        <target>Edit currency</target>
+        <target>Edit [currency]</target>
       </segment>
     </unit>
     <unit id="aTtTsUc" name="currency.new">
@@ -134,7 +134,7 @@
       </notes>
       <segment state="translated">
         <source>currency.new</source>
-        <target>New currency</target>
+        <target>New [currency]</target>
       </segment>
     </unit>
     <unit id="YFQ8iCW" name="project.caption">
@@ -155,7 +155,7 @@
       </notes>
       <segment state="translated">
         <source>project.edit</source>
-        <target>Edit project</target>
+        <target>Edit [project]</target>
       </segment>
     </unit>
     <unit id="sYgrSg9" name="project.new">
@@ -165,7 +165,7 @@
       </notes>
       <segment state="translated">
         <source>project.new</source>
-        <target>New project</target>
+        <target>New [project]</target>
       </segment>
     </unit>
     <unit id="eLrezdb" name="search.placeholder">
@@ -395,7 +395,7 @@
       </notes>
       <segment state="translated">
         <source>footprint.edit</source>
-        <target>Edit footprint</target>
+        <target>Edit [footprint]</target>
       </segment>
     </unit>
     <unit id="9RgpRoK" name="footprint.new">
@@ -405,7 +405,7 @@
       </notes>
       <segment state="translated">
         <source>footprint.new</source>
-        <target>New footprint</target>
+        <target>New [footprint]</target>
       </segment>
     </unit>
     <unit id="m27aWeR" name="user.edit.permissions">
@@ -427,7 +427,7 @@
       </notes>
       <segment state="translated">
         <source>group.edit</source>
-        <target>Edit group</target>
+        <target>Edit [group]</target>
       </segment>
     </unit>
     <unit id="_RN3Wph" name="group.new">
@@ -437,7 +437,7 @@
       </notes>
       <segment state="translated">
         <source>group.new</source>
-        <target>New group</target>
+        <target>New [group]</target>
       </segment>
     </unit>
     <unit id="GgwITAf" name="label_profile.advanced">
@@ -465,7 +465,7 @@
       </notes>
       <segment state="translated">
         <source>label_profile.edit</source>
-        <target>Edit label profile</target>
+        <target>Edit [label_profile]</target>
       </segment>
     </unit>
     <unit id="WkNFJjx" name="label_profile.new">
@@ -475,7 +475,7 @@
       </notes>
       <segment state="translated">
         <source>label_profile.new</source>
-        <target>New label profile</target>
+        <target>New [label_profile]</target>
       </segment>
     </unit>
     <unit id="AVQBOWW" name="manufacturer.edit">
@@ -485,7 +485,7 @@
       </notes>
       <segment state="translated">
         <source>manufacturer.edit</source>
-        <target>Edit manufacturer</target>
+        <target>Edit [manufacturer]</target>
       </segment>
     </unit>
     <unit id="dRX_cvD" name="manufacturer.new">
@@ -495,7 +495,7 @@
       </notes>
       <segment state="translated">
         <source>manufacturer.new</source>
-        <target>New manufacturer</target>
+        <target>New [manufacturer]</target>
       </segment>
     </unit>
     <unit id="crdkzlg" name="storelocation.labelp">
@@ -520,7 +520,7 @@
       </notes>
       <segment state="translated">
         <source>storelocation.edit</source>
-        <target>Edit storage location</target>
+        <target>Edit [storage_location]</target>
       </segment>
     </unit>
     <unit id="am0iTCO" name="storelocation.new">
@@ -530,7 +530,7 @@
       </notes>
       <segment state="translated">
         <source>storelocation.new</source>
-        <target>New storage location</target>
+        <target>New [storage_location]</target>
       </segment>
     </unit>
     <unit id="Rt3eY_7" name="supplier.caption">
@@ -551,7 +551,7 @@
       </notes>
       <segment state="translated">
         <source>supplier.edit</source>
-        <target>Edit supplier</target>
+        <target>Edit [supplier]</target>
       </segment>
     </unit>
     <unit id="b8jlkMd" name="supplier.new">
@@ -561,7 +561,7 @@
       </notes>
       <segment state="translated">
         <source>supplier.new</source>
-        <target>New supplier</target>
+        <target>New [supplier]</target>
       </segment>
     </unit>
     <unit id="Ux8wVuF" name="user.edit.configuration">
@@ -694,7 +694,7 @@ The user will have to set up all two-factor authentication methods again and pri
       </notes>
       <segment state="translated">
         <source>user.edit</source>
-        <target>Edit user</target>
+        <target>Edit [user]</target>
       </segment>
     </unit>
     <unit id="esEoaa_" name="user.new">
@@ -704,7 +704,7 @@ The user will have to set up all two-factor authentication methods again and pri
       </notes>
       <segment state="translated">
         <source>user.new</source>
-        <target>New user</target>
+        <target>New [user]</target>
       </segment>
     </unit>
     <unit id="KqHffuc" name="attachment.delete">
@@ -1024,7 +1024,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>entity.info.parts_count</source>
-        <target>Number of parts with this element</target>
+        <target>Number of [[part]] with this element</target>
       </segment>
     </unit>
     <unit id="o0XIi58" name="specifications.property">
@@ -1738,7 +1738,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>part.edit.title</source>
-        <target>Edit part</target>
+        <target>Edit [part]</target>
       </segment>
     </unit>
     <unit id="yFxHuAp" name="part.edit.card_title">
@@ -1749,7 +1749,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>part.edit.card_title</source>
-        <target>Edit part</target>
+        <target>Edit [part]</target>
       </segment>
     </unit>
     <unit id="EwY218_" name="part.edit.tab.common">
@@ -1899,7 +1899,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>part.new.card_title</source>
-        <target>Create new part</target>
+        <target>Create new [part]</target>
       </segment>
     </unit>
     <unit id="5TCcXwk" name="part_lot.delete">
@@ -1963,7 +1963,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>part.info.title</source>
-        <target>Detail info for part</target>
+        <target>Detail info for [part]</target>
       </segment>
     </unit>
     <unit id="c9.fQPj" name="part.part_lots.label">
@@ -2129,7 +2129,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="final">
         <source>user.creating_user</source>
-        <target>User who created this part</target>
+        <target>User who created this [part]</target>
       </segment>
     </unit>
     <unit id="KEhkI6s" name="Unknown">
@@ -2167,7 +2167,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="final">
         <source>user.last_editing_user</source>
-        <target>User who edited this part last</target>
+        <target>User who edited this [part] last</target>
       </segment>
     </unit>
     <unit id="R8D9PGv" name="part.isFavorite">
@@ -2551,7 +2551,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>part.edit.btn</source>
-        <target>Edit part</target>
+        <target>Edit [part]</target>
       </segment>
     </unit>
     <unit id="TNzs45Y" name="part.clone.btn">
@@ -2562,7 +2562,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>part.clone.btn</source>
-        <target>Clone part</target>
+        <target>Clone [part]</target>
       </segment>
     </unit>
     <unit id="RG1RD20" name="part.create.btn">
@@ -2573,7 +2573,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>part.create.btn</source>
-        <target>Create new part</target>
+        <target>Create new [part]</target>
       </segment>
     </unit>
     <unit id="kxAbZAe" name="part.delete.confirm_title">
@@ -2583,7 +2583,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>part.delete.confirm_title</source>
-        <target>Do you really want to delete this part?</target>
+        <target>Do you really want to delete this [part]?</target>
       </segment>
     </unit>
     <unit id="owQRbkU" name="part.delete.message">
@@ -2593,7 +2593,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>part.delete.message</source>
-        <target>This part and any associated information (like attachments, price information, etc.) will be deleted. This can not be undone!</target>
+        <target>This [part] and any associated information (like attachments, price information, etc.) will be deleted. This can not be undone!</target>
       </segment>
     </unit>
     <unit id="oH8.Zx6" name="part.delete">
@@ -2603,7 +2603,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>part.delete</source>
-        <target>Delete part</target>
+        <target>Delete [part]</target>
       </segment>
     </unit>
     <unit id="P7nc8TK" name="parts_list.all.title">
@@ -2613,7 +2613,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>parts_list.all.title</source>
-        <target>All parts</target>
+        <target>All [[part]]</target>
       </segment>
     </unit>
     <unit id="aSDZrnb" name="parts_list.category.title">
@@ -2623,7 +2623,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>parts_list.category.title</source>
-        <target>Parts with category</target>
+        <target>[[part]] with [category]</target>
       </segment>
     </unit>
     <unit id="qZfLMs5" name="parts_list.footprint.title">
@@ -2633,7 +2633,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>parts_list.footprint.title</source>
-        <target>Parts with footprint</target>
+        <target>[[part]] with [footprint]</target>
       </segment>
     </unit>
     <unit id="wzH1LnU" name="parts_list.manufacturer.title">
@@ -2643,7 +2643,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>parts_list.manufacturer.title</source>
-        <target>Parts with manufacturer</target>
+        <target>[[part]] with [manufacturer]</target>
       </segment>
     </unit>
     <unit id="z0tqm9_" name="parts_list.search.title">
@@ -2653,7 +2653,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>parts_list.search.title</source>
-        <target>Search Parts</target>
+        <target>Search [[part]]</target>
       </segment>
     </unit>
     <unit id=".nsfK4V" name="parts_list.storelocation.title">
@@ -2663,7 +2663,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>parts_list.storelocation.title</source>
-        <target>Parts with storage locations</target>
+        <target>[[part]] with [[storage_location]]</target>
       </segment>
     </unit>
     <unit id="dqIl9gT" name="parts_list.supplier.title">
@@ -2673,7 +2673,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>parts_list.supplier.title</source>
-        <target>Parts with supplier</target>
+        <target>[[part]] with [supplier]</target>
       </segment>
     </unit>
     <unit id="BJygaSh" name="parts_list.tags.title">
@@ -3111,7 +3111,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>statistics.distinct_parts_count</source>
-        <target>Number of distinct parts</target>
+        <target>Number of distinct [[part]]</target>
       </segment>
     </unit>
     <unit id="sIGqnJ0" name="statistics.parts_instock_sum">
@@ -3122,7 +3122,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>statistics.parts_instock_sum</source>
-        <target>Sum of all parts stocks</target>
+        <target>Sum of all [[part]] stocks</target>
       </segment>
     </unit>
     <unit id="uHmvfnI" name="statistics.parts_with_price">
@@ -3133,7 +3133,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>statistics.parts_with_price</source>
-        <target>Number of parts with price information</target>
+        <target>Number of [[part]] with price information</target>
       </segment>
     </unit>
     <unit id="7x89_xL" name="statistics.categories_count">
@@ -3144,7 +3144,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>statistics.categories_count</source>
-        <target>Number of categories</target>
+        <target>Number of [[category]]</target>
       </segment>
     </unit>
     <unit id="s0nLRjN" name="statistics.footprints_count">
@@ -3155,7 +3155,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>statistics.footprints_count</source>
-        <target>Number of footprints</target>
+        <target>Number of [[footprint]]</target>
       </segment>
     </unit>
     <unit id="f0gHZzl" name="statistics.manufacturers_count">
@@ -3166,7 +3166,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>statistics.manufacturers_count</source>
-        <target>Number of manufacturers</target>
+        <target>Number of [[manufacturer]]</target>
       </segment>
     </unit>
     <unit id="_4rvCd3" name="statistics.storelocations_count">
@@ -3177,7 +3177,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>statistics.storelocations_count</source>
-        <target>Number of storage locations</target>
+        <target>Number of [[storage_location]]</target>
       </segment>
     </unit>
     <unit id="tzzUvrm" name="statistics.suppliers_count">
@@ -3188,7 +3188,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>statistics.suppliers_count</source>
-        <target>Number of suppliers</target>
+        <target>Number of [[supplier]]</target>
       </segment>
     </unit>
     <unit id="QEk.sHE" name="statistics.currencies_count">
@@ -3199,7 +3199,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>statistics.currencies_count</source>
-        <target>Number of currencies</target>
+        <target>Number of [[currency]]</target>
       </segment>
     </unit>
     <unit id="MTCnGlN" name="statistics.measurement_units_count">
@@ -3210,7 +3210,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>statistics.measurement_units_count</source>
-        <target>Number of measurement units</target>
+        <target>Number of [[measurement_unit]]</target>
       </segment>
     </unit>
     <unit id="7sRXll2" name="statistics.devices_count">
@@ -3221,7 +3221,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>statistics.devices_count</source>
-        <target>Number of projects</target>
+        <target>Number of [[project]]</target>
       </segment>
     </unit>
     <unit id="2u7zTMF" name="statistics.attachment_types_count">
@@ -3232,7 +3232,7 @@ Sub elements will be moved upwards.]]></target>
       </notes>
       <segment state="translated">
         <source>statistics.attachment_types_count</source>
-        <target>Number of attachment types</target>
+        <target>Number of [[attachment_type]]</target>
       </segment>
     </unit>
     <unit id="C0XsLQc" name="statistics.all_attachments_count">
@@ -6156,7 +6156,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>tree.tools.edit.attachment_types</source>
-        <target>Attachment types</target>
+        <target>{{attachment_type}}</target>
       </segment>
     </unit>
     <unit id="u8jQbAc" name="tree.tools.edit.categories">
@@ -6167,7 +6167,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>tree.tools.edit.categories</source>
-        <target>Categories</target>
+        <target>{{category}}</target>
       </segment>
     </unit>
     <unit id="3n2K_az" name="tree.tools.edit.projects">
@@ -6178,7 +6178,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>tree.tools.edit.projects</source>
-        <target>Projects</target>
+        <target>{{project}}</target>
       </segment>
     </unit>
     <unit id="raK7qaK" name="tree.tools.edit.suppliers">
@@ -6189,7 +6189,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>tree.tools.edit.suppliers</source>
-        <target>Suppliers</target>
+        <target>{{supplier}}</target>
       </segment>
     </unit>
     <unit id="1IJ48Y0" name="tree.tools.edit.manufacturer">
@@ -6200,7 +6200,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>tree.tools.edit.manufacturer</source>
-        <target>Manufacturers</target>
+        <target>{{manufacturer}}</target>
       </segment>
     </unit>
     <unit id="GNbWH_O" name="tree.tools.edit.storelocation">
@@ -6210,7 +6210,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>tree.tools.edit.storelocation</source>
-        <target>Storage locations</target>
+        <target>{{storage_location}}</target>
       </segment>
     </unit>
     <unit id="7ZOhkd." name="tree.tools.edit.footprint">
@@ -6220,7 +6220,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>tree.tools.edit.footprint</source>
-        <target>Footprints</target>
+        <target>{{footprint}}</target>
       </segment>
     </unit>
     <unit id="U1zYjzD" name="tree.tools.edit.currency">
@@ -6230,7 +6230,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>tree.tools.edit.currency</source>
-        <target>Currencies</target>
+        <target>{{currency}}</target>
       </segment>
     </unit>
     <unit id="NnzEujm" name="tree.tools.edit.measurement_unit">
@@ -6240,13 +6240,13 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>tree.tools.edit.measurement_unit</source>
-        <target>Measurement Unit</target>
+        <target>{{measurement_unit}}</target>
       </segment>
     </unit>
     <unit id="oYLWbbv" name="tree.tools.edit.part_custom_state">
       <segment state="translated">
         <source>tree.tools.edit.part_custom_state</source>
-        <target>Custom part states</target>
+        <target>{{part_custom_state}}</target>
       </segment>
     </unit>
     <unit id=".Ux4R3T" name="tree.tools.edit.label_profile">
@@ -6255,7 +6255,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>tree.tools.edit.label_profile</source>
-        <target>Label profiles</target>
+        <target>{{label_profile}}</target>
       </segment>
     </unit>
     <unit id="eyvi0Zt" name="tree.tools.edit.part">
@@ -6265,7 +6265,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>tree.tools.edit.part</source>
-        <target>New part</target>
+        <target>New [part]</target>
       </segment>
     </unit>
     <unit id="nIHj_yk" name="tree.tools.show.all_parts">
@@ -6276,7 +6276,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>tree.tools.show.all_parts</source>
-        <target>Show all parts</target>
+        <target>Show all [[part]]</target>
       </segment>
     </unit>
     <unit id="JxVmFbM" name="tree.tools.show.all_attachments">
@@ -6307,7 +6307,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>tree.tools.system.users</source>
-        <target>Users</target>
+        <target>{{user}}</target>
       </segment>
     </unit>
     <unit id="dTEQQ3T" name="tree.tools.system.groups">
@@ -6317,7 +6317,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>tree.tools.system.groups</source>
-        <target>Groups</target>
+        <target>{{group}}</target>
       </segment>
     </unit>
     <unit id="NWWki1R" name="tree.tools.system.event_log">
@@ -6639,7 +6639,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>validator.part_lot.location_full</source>
-        <target>The storage location was marked as full, so you can not add a new part to it.</target>
+        <target>The [storage_location] was marked as full, so you can not add a new [part] to it.</target>
       </segment>
     </unit>
     <unit id="h6qELde" name="validator.part_lot.only_existing">
@@ -6649,7 +6649,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>validator.part_lot.only_existing</source>
-        <target>The storage location was marked as "only existing", so you can not add new part to it.</target>
+        <target>The [storage_location] was marked as "only existing", so you can not add new [part] to it.</target>
       </segment>
     </unit>
     <unit id="2yWi8eP" name="validator.part_lot.single_part">
@@ -6659,7 +6659,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>validator.part_lot.single_part</source>
-        <target>The storage location was marked as "single part", so you can not add a new part to it.</target>
+        <target>The [storage_location] was marked as "single [part]", so you can not add a new [part] to it.</target>
       </segment>
     </unit>
     <unit id="aBSsuxp" name="m_status.active.help">
@@ -6840,7 +6840,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>entity.edit.not_selectable.help</source>
-        <target>If this option is activated, this element can not be assigned to a part property. Useful if this element is just used for grouping.</target>
+        <target>If this option is activated, this element can not be assigned to a [part] property. Useful if this element is just used for grouping.</target>
       </segment>
     </unit>
     <unit id="poCwov." name="bbcode.hint">
@@ -6880,7 +6880,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>category.edit.disable_footprints</source>
-        <target>Disable footprints</target>
+        <target>Disable [[footprint]]</target>
       </segment>
     </unit>
     <unit id="MLbac5k" name="category.edit.disable_footprints.help">
@@ -6890,7 +6890,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>category.edit.disable_footprints.help</source>
-        <target>If this option is activated, the footprint property is disabled for all parts with this category.</target>
+        <target>If this option is activated, the [footprint] property is disabled for all [[part]] with this [category].</target>
       </segment>
     </unit>
     <unit id="JWHe4Hi" name="category.edit.disable_manufacturers">
@@ -6900,7 +6900,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>category.edit.disable_manufacturers</source>
-        <target>Disable manufacturers</target>
+        <target>Disable [[manufacturer]]</target>
       </segment>
     </unit>
     <unit id=".ItLezq" name="category.edit.disable_manufacturers.help">
@@ -6910,7 +6910,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>category.edit.disable_manufacturers.help</source>
-        <target>If this option is activated, the manufacturer property is disabled for all parts with this category.</target>
+        <target>If this option is activated, the [manufacturer] property is disabled for all [[part]] with this [category].</target>
       </segment>
     </unit>
     <unit id="g_gRbhu" name="category.edit.disable_autodatasheets">
@@ -6930,7 +6930,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>category.edit.disable_autodatasheets.help</source>
-        <target>If this option is activated, no automatic links to datasheets are created for parts with this category.</target>
+        <target>If this option is activated, no automatic links to datasheets are created for [[part]] with this [category].</target>
       </segment>
     </unit>
     <unit id="QzSkLse" name="category.edit.disable_properties">
@@ -6950,7 +6950,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can
       </notes>
       <segment state="translated">
         <source>category.edit.disable_properties.help</source>
-        <target>If this option is activated, the part properties are disabled for parts with this category.</target>
+        <target>If this option is activated, the [part] properties are disabled for [[part]] with this [category].</target>
       </segment>
     </unit>
     <unit id="ILoRXgM" name="category.edit.partname_hint">
@@ -7285,7 +7285,7 @@ Element 1 -> Element 1.2]]></target>
       </notes>
       <segment state="translated">
         <source>storelocation.edit.is_full.help</source>
-        <target>If this option is selected, it is neither possible to add new parts to this storelocation or to increase the amount of existing parts.</target>
+        <target>If this option is selected, it is neither possible to add new [[part]] to this storelocation or to increase the amount of existing [[part]].</target>
       </segment>
     </unit>
     <unit id="V1su4ac" name="storelocation.limit_to_existing.label">
@@ -7295,7 +7295,7 @@ Element 1 -> Element 1.2]]></target>
       </notes>
       <segment state="translated">
         <source>storelocation.limit_to_existing.label</source>
-        <target>Limit to existing parts</target>
+        <target>Limit to existing [[part]]</target>
       </segment>
     </unit>
     <unit id="6D.6huj" name="storelocation.limit_to_existing.help">
@@ -7305,7 +7305,7 @@ Element 1 -> Element 1.2]]></target>
       </notes>
       <segment state="translated">
         <source>storelocation.limit_to_existing.help</source>
-        <target>If this option is activated, it is not possible to add new parts to this storelocation, but the amount of existing parts can be increased.</target>
+        <target>If this option is activated, it is not possible to add new [[part]] to this storelocation, but the amount of existing [[part]] can be increased.</target>
       </segment>
     </unit>
     <unit id="tGVVeof" name="storelocation.only_single_part.label">
@@ -7315,7 +7315,7 @@ Element 1 -> Element 1.2]]></target>
       </notes>
       <segment state="translated">
         <source>storelocation.only_single_part.label</source>
-        <target>Only single part</target>
+        <target>Only single [part]</target>
       </segment>
     </unit>
     <unit id="Hyh5pvY" name="storelocation.only_single_part.help">
@@ -7325,7 +7325,7 @@ Element 1 -> Element 1.2]]></target>
       </notes>
       <segment state="translated">
         <source>storelocation.only_single_part.help</source>
-        <target>If this option is activated, only a single part (with every amount) can be assigned to this storage location. Useful for small SMD boxes or feeders.</target>
+        <target>If this option is activated, only a single [part] (with every amount) can be assigned to this [storage_location]. Useful for small SMD boxes or feeders.</target>
       </segment>
     </unit>
     <unit id="sty2ele" name="storelocation.storage_type.label">
@@ -7345,7 +7345,7 @@ Element 1 -> Element 1.2]]></target>
       </notes>
       <segment state="translated">
         <source>storelocation.storage_type.help</source>
-        <target>You can select a measurement unit here, which a part must have to be able to be assigned to this storage location</target>
+        <target>You can select a [measurement_unit] here, which a [part] must have to be able to be assigned to this [storage_location]</target>
       </segment>
     </unit>
     <unit id="ilC3c6u" name="supplier.edit.default_currency">
@@ -7725,7 +7725,7 @@ Element 1 -> Element 1.2]]></target>
       </notes>
       <segment state="translated">
         <source>perm.part.all_parts</source>
-        <target>List all parts</target>
+        <target>List all [[part]]</target>
       </segment>
     </unit>
     <unit id="xGpxdp3" name="perm.part.no_price_parts">
@@ -7735,7 +7735,7 @@ Element 1 -> Element 1.2]]></target>
       </notes>
       <segment state="translated">
         <source>perm.part.no_price_parts</source>
-        <target>List parts without price info</target>
+        <target>List [[part]] without price info</target>
       </segment>
     </unit>
     <unit id="gVBtadZ" name="perm.part.obsolete_parts">
@@ -7745,7 +7745,7 @@ Element 1 -> Element 1.2]]></target>
       </notes>
       <segment state="translated">
         <source>perm.part.obsolete_parts</source>
-        <target>List obsolete parts</target>
+        <target>List obsolete [[part]]</target>
       </segment>
     </unit>
     <unit id="rh5syrd" name="perm.part.unknown_instock_parts">
@@ -8872,7 +8872,7 @@ Element 1 -> Element 1.2]]></target>
     <unit id="DachcxN" name="part.table.edit.title">
       <segment state="translated">
         <source>part.table.edit.title</source>
-        <target>Edit part</target>
+        <target>Edit [part]</target>
       </segment>
     </unit>
     <unit id="keLmdcq" name="part_list.action.scrollable_hint">
@@ -9604,7 +9604,7 @@ Element 1 -> Element 1.2]]></target>
     <unit id="e97FPsh" name="entity.info.parts_count_recursive">
       <segment state="translated">
         <source>entity.info.parts_count_recursive</source>
-        <target>Number of parts with this element or its sub elements</target>
+        <target>Number of [[part]] with this element or its sub elements</target>
       </segment>
     </unit>
     <unit id="st92iWF" name="tools.server_infos.title">
@@ -9838,13 +9838,13 @@ Element 1 -> Element 1.2]]></target>
     <unit id="hpPkHYF" name="project.add_parts_to_project">
       <segment state="translated">
         <source>project.add_parts_to_project</source>
-        <target>Add parts to project BOM</target>
+        <target>Add [[part]] to [project] BOM</target>
       </segment>
     </unit>
     <unit id="mauieYX" name="part.info.add_part_to_project">
       <segment state="translated">
         <source>part.info.add_part_to_project</source>
-        <target>Add this part to a project</target>
+        <target>Add this [part] to a [project]</target>
       </segment>
     </unit>
     <unit id="5r.n1zf" name="project_bom_entry.label">
@@ -9892,43 +9892,43 @@ Element 1 -> Element 1.2]]></target>
     <unit id="9GtmqC1" name="part.new_build_part.error.build_part_already_exists">
       <segment state="translated">
         <source>part.new_build_part.error.build_part_already_exists</source>
-        <target>The project already has a build part!</target>
+        <target>The [project] already has a build [part]!</target>
       </segment>
     </unit>
     <unit id="9soO_kf" name="project.edit.associated_build_part">
       <segment state="translated">
         <source>project.edit.associated_build_part</source>
-        <target>Associated builds part</target>
+        <target>Associated builds [part]</target>
       </segment>
     </unit>
     <unit id="8Mu.T78" name="project.edit.associated_build_part.add">
       <segment state="translated">
         <source>project.edit.associated_build_part.add</source>
-        <target>Add builds part</target>
+        <target>Add builds [part]</target>
       </segment>
     </unit>
     <unit id="sPdCBUl" name="project.edit.associated_build.hint">
       <segment state="translated">
         <source>project.edit.associated_build.hint</source>
-        <target>This part represents the builds of this project, which are stored somewhere.</target>
+        <target>This [part] represents the builds of this [project], which are stored somewhere.</target>
       </segment>
     </unit>
     <unit id="Cke2p4U" name="part.info.projectBuildPart.hint">
       <segment state="translated">
         <source>part.info.projectBuildPart.hint</source>
-        <target>This part represents the builds of the following project and is associated with it</target>
+        <target>This [part] represents the builds of the following [project] and is associated with it</target>
       </segment>
     </unit>
     <unit id="yCR6rBb" name="part.is_build_part">
       <segment state="translated">
         <source>part.is_build_part</source>
-        <target>Is project builds part</target>
+        <target>Is [project] builds [part]</target>
       </segment>
     </unit>
     <unit id="dV.E0zI" name="project.info.title">
       <segment state="translated">
         <source>project.info.title</source>
-        <target>Project info</target>
+        <target>{project} info</target>
       </segment>
     </unit>
     <unit id="LYURecm" name="project.info.bom_entries_count">
@@ -10126,13 +10126,13 @@ Element 1 -> Element 1.2]]></target>
     <unit id="TRh.K81" name="part_list.action.projects.generate_label">
       <segment state="translated">
         <source>part_list.action.projects.generate_label</source>
-        <target>Generate labels (for parts)</target>
+        <target>Generate labels (for [[part]])</target>
       </segment>
     </unit>
     <unit id="CEr_90G" name="part_list.action.projects.generate_label_lot">
       <segment state="translated">
         <source>part_list.action.projects.generate_label_lot</source>
-        <target>Generate labels (for part lots)</target>
+        <target>Generate labels (for [[part_lot]])</target>
       </segment>
     </unit>
     <unit id="QjZuQlv" name="part_list.action.generate_label.empty">
@@ -10156,7 +10156,7 @@ Element 1 -> Element 1.2]]></target>
     <unit id=".I7zcoK" name="project.builds.following_bom_entries_miss_instock">
       <segment state="translated">
         <source>project.builds.following_bom_entries_miss_instock</source>
-        <target>The following parts have not enough stock to build this project at least once:</target>
+        <target>The following [[part]] have not enough stock to build this [project] at least once:</target>
       </segment>
     </unit>
     <unit id="fGT0qfb" name="project.builds.stocked">
@@ -10180,19 +10180,19 @@ Element 1 -> Element 1.2]]></target>
     <unit id="NdZ1t7a" name="project.builds.number_of_builds_possible">
       <segment state="translated">
         <source>project.builds.number_of_builds_possible</source>
-        <target><![CDATA[You have enough stocked to build <b>%max_builds%</b> 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><![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>
+        <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">
       <segment state="translated">
         <source>project.builds.following_bom_entries_miss_instock_n</source>
-        <target>You do not have enough parts stocked to build this project %number_of_builds% times. The following parts have missing instock:</target>
+        <target>You do not have enough [[part]] stocked to build this [project] %number_of_builds% times. The following [[part]] have missing instock:</target>
       </segment>
     </unit>
     <unit id="1BGl3Dv" name="project.build.flash.invalid_input">
@@ -10216,7 +10216,7 @@ Element 1 -> Element 1.2]]></target>
     <unit id="zgLSR.X" name="project.build.help">
       <segment state="translated">
         <source>project.build.help</source>
-        <target>Choose from which part lots the stock to build this project should be taken (and in which amount). Check the checkbox for each BOM Entry, when you are finished withdrawing the parts, or use the top checkbox to check all boxes at once.</target>
+        <target>Choose from which [[part_lot]] the stock to build this [project] should be taken (and in which amount). Check the checkbox for each BOM Entry, when you are finished withdrawing the [[part]], or use the top checkbox to check all boxes at once.</target>
       </segment>
     </unit>
     <unit id="srYaI3Z" name="project.build.buildsPartLot.new_lot">
@@ -10486,13 +10486,13 @@ Element 1 -> Element 1.2]]></target>
     <unit id="1swuUz4" name="log.element_edited.changed_fields.disable_footprints">
       <segment state="translated">
         <source>log.element_edited.changed_fields.disable_footprints</source>
-        <target>Disable footprints</target>
+        <target>Disable [[footprint]]</target>
       </segment>
     </unit>
     <unit id="sZ3vQaH" name="log.element_edited.changed_fields.disable_manufacturers">
       <segment state="translated">
         <source>log.element_edited.changed_fields.disable_manufacturers</source>
-        <target>Disable manufacturers</target>
+        <target>Disable [[manufacturer]]</target>
       </segment>
     </unit>
     <unit id="lLXp.Sn" name="log.element_edited.changed_fields.disable_autodatasheets">
@@ -11104,25 +11104,25 @@ Element 1 -> Element 1.2]]></target>
     <unit id="r5F3f_G" name="measurement_unit.new">
       <segment state="translated">
         <source>measurement_unit.new</source>
-        <target>New Measurement Unit</target>
+        <target>New [measurement_unit]</target>
       </segment>
     </unit>
     <unit id="W.vDRLw" name="measurement_unit.edit">
       <segment state="translated">
         <source>measurement_unit.edit</source>
-        <target>Edit Measurement Unit</target>
+        <target>Edit [measurement_unit]</target>
       </segment>
     </unit>
     <unit id="Ae0GMtY" name="part_custom_state.new">
       <segment state="translated">
         <source>part_custom_state.new</source>
-        <target>New custom part state</target>
+        <target>New [part_custom_state]</target>
       </segment>
     </unit>
     <unit id="5uZ23wR" name="part_custom_state.edit">
       <segment state="translated">
         <source>part_custom_state.edit</source>
-        <target>Edit custom part state</target>
+        <target>Edit [part_custom_state]</target>
       </segment>
     </unit>
     <unit id="uW2WHHC" name="user.aboutMe.label">
@@ -11140,7 +11140,7 @@ Element 1 -> Element 1.2]]></target>
     <unit id="lYlHhtl" name="storelocation.part_owner_must_match.label">
       <segment state="translated">
         <source>storelocation.part_owner_must_match.label</source>
-        <target>Part Lot owner must match storage location owner</target>
+        <target>[part_lot] owner must match [storage_location] owner</target>
       </segment>
     </unit>
     <unit id="eMHXpbV" name="part_lot.owner">
@@ -11176,7 +11176,7 @@ Element 1 -> Element 1.2]]></target>
     <unit id="9zWwSvC" name="part.withdraw.access_denied">
       <segment state="translated">
         <source>part.withdraw.access_denied</source>
-        <target>Not allowed to do the desired action. Please check your permissions and the owner of the part lots.</target>
+        <target>Not allowed to do the desired action. Please check your permissions and the owner of the [[part_lot]].</target>
       </segment>
     </unit>
     <unit id="4ynARET" name="part.info.amount.less_than_desired">
@@ -11194,7 +11194,7 @@ Element 1 -> Element 1.2]]></target>
     <unit id="krpFlYH" name="log.element_edited.changed_fields.part_owner_must_match">
       <segment state="translated">
         <source>log.element_edited.changed_fields.part_owner_must_match</source>
-        <target>Part owner must match storage location owner</target>
+        <target>[part] owner must match [storage_location] owner</target>
       </segment>
     </unit>
     <unit id="o5u.Nnz" name="part.filter.lessThanDesired">
@@ -11772,7 +11772,7 @@ Please note, that you can not impersonate a disabled user. If you try you will g
     <unit id="bkPXoxM" name="project.build.dont_check_quantity.help">
       <segment state="translated">
         <source>project.build.dont_check_quantity.help</source>
-        <target>If this option is selected, the given withdraw quantities are used as given, no matter if more or less parts are actually required to build this project.</target>
+        <target>If this option is selected, the given withdraw quantities are used as given, no matter if more or less [[part]] are actually required to build this [project].</target>
       </segment>
     </unit>
     <unit id="XsE9cmC" name="part_list.action.invert_selection">