diff --git a/src/Controller/AdminPages/BaseAdminController.php b/src/Controller/AdminPages/BaseAdminController.php
index b2a6034a..a593eb43 100644
--- a/src/Controller/AdminPages/BaseAdminController.php
+++ b/src/Controller/AdminPages/BaseAdminController.php
@@ -107,13 +107,13 @@ abstract class BaseAdminController extends AbstractController
 
             $em->persist($entity);
             $em->flush();
-            $this->addFlash('success', $this->translator->trans('entity.edit_flash'));
+            $this->addFlash('success', 'entity.edit_flash');
 
             //Rebuild form, so it is based on the updated data. Important for the parent field!
             //We can not use dynamic form events here, because the parent entity list is build from database!
             $form = $this->createForm($this->form_class, $entity, ['attachment_class' => $this->attachment_class]);
         } elseif ($form->isSubmitted() && !$form->isValid()) {
-            $this->addFlash('error', $this->translator->trans('entity.edit_flash.invalid'));
+            $this->addFlash('error', 'entity.edit_flash.invalid');
         }
 
         return $this->render($this->twig_template, [
@@ -163,13 +163,13 @@ abstract class BaseAdminController extends AbstractController
 
             $em->persist($new_entity);
             $em->flush();
-            $this->addFlash('success', $this->translator->trans('entity.created_flash'));
+            $this->addFlash('success', 'entity.created_flash');
 
             return $this->redirectToRoute($this->route_base.'_edit', ['id' => $new_entity->getID()]);
         }
 
         if ($form->isSubmitted() && !$form->isValid()) {
-            $this->addFlash('error', $this->translator->trans('entity.created_flash.invalid'));
+            $this->addFlash('error', 'entity.created_flash.invalid');
         }
 
         //Import form
diff --git a/src/Controller/DebugController.php b/src/Controller/DebugController.php
deleted file mode 100644
index 8b3209ec..00000000
--- a/src/Controller/DebugController.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * This file is part of Part-DB (https://github.com/Part-DB/Part-DB-symfony).
- *
- * Copyright (C) 2019 Jan Böhmer (https://github.com/jbtronics)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
- */
-
-namespace App\Controller;
-
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\Routing\Annotation\Route;
-use Symfony\Contracts\Translation\TranslatorInterface;
-
-/**
- * Class DebugController.
- */
-class DebugController extends AbstractController
-{
-    /**
-     * @Route("/debug/flash_test")
-     */
-    public function flashTest()
-    {
-        $this->addFlash('success', 'Success Flash Message!');
-        $this->addFlash('error', 'Error Flash Message!');
-        $this->addFlash('warning', 'Warning Flash Message!');
-        $this->addFlash('notice', 'Notice Flash Message!');
-        $this->addFlash('info', 'Info Flash Message! <b>Test</b>');
-
-        $this->addFlash('testkjfd', 'Blabla. This message type should be not know to template!');
-
-        return $this->render('base.html.twig');
-    }
-
-    /**
-     * @Route("/debug/dummy")
-     */
-    public function dummy(TranslatorInterface $translator)
-    {
-        //Here we collect translation keys automatically created, so they can be extracted easily
-
-        //Validators:
-        $translator->trans('validator.noneofitschild.self');
-        $translator->trans('validator.noneofitschild.children');
-        $translator->trans('validator.isSelectable');
-        $translator->trans('validator.part_lot.location_full.no_increasment');
-        $translator->trans('validator.part_lot.location_full');
-        $translator->trans('validator.part_lot.only_existing');
-        $translator->trans('validator.part_lot.single_part');
-
-        //Manufacturer status
-        $translator->trans('m_status.active.help');
-        $translator->trans('m_status.announced.help');
-        $translator->trans('m_status.discontinued.help');
-        $translator->trans('m_status.eol.help');
-        $translator->trans('m_status.nrfnd.help');
-        $translator->trans('m_status.unknown.help');
-
-        //Flash titles
-        $translator->trans('flash.success');
-        $translator->trans('flash.error');
-        $translator->trans('flash.warning');
-        $translator->trans('flash.notice');
-        $translator->trans('flash.info');
-
-        $translator->trans('validator.noLockout');
-    }
-}
diff --git a/src/Controller/PartController.php b/src/Controller/PartController.php
index e5145f39..1c6c84ae 100644
--- a/src/Controller/PartController.php
+++ b/src/Controller/PartController.php
@@ -97,11 +97,11 @@ class PartController extends AbstractController
 
             $em->persist($part);
             $em->flush();
-            $this->addFlash('info', $translator->trans('part.edited_flash'));
+            $this->addFlash('info', 'part.edited_flash');
             //Reload form, so the SIUnitType entries use the new part unit
             $form = $this->createForm(PartBaseType::class, $part);
         } elseif ($form->isSubmitted() && !$form->isValid()) {
-            $this->addFlash('error', $translator->trans('part.edited_flash.invalid'));
+            $this->addFlash('error', 'part.edited_flash.invalid');
         }
 
         return $this->render('Parts/edit/edit_part_info.html.twig',
@@ -180,13 +180,13 @@ class PartController extends AbstractController
 
             $em->persist($new_part);
             $em->flush();
-            $this->addFlash('success', $translator->trans('part.created_flash'));
+            $this->addFlash('success', 'part.created_flash');
 
             return $this->redirectToRoute('part_edit', ['id' => $new_part->getID()]);
         }
 
         if ($form->isSubmitted() && !$form->isValid()) {
-            $this->addFlash('error', $translator->trans('part.created_flash.invalid'));
+            $this->addFlash('error', 'part.created_flash.invalid');
         }
 
         return $this->render('Parts/edit/new_part.html.twig',
@@ -216,7 +216,7 @@ class PartController extends AbstractController
         if ($form->isSubmitted() && $form->isValid()) {
             $em->persist($new_part);
             $em->flush();
-            $this->addFlash('success', $translator->trans('part.created_flash'));
+            $this->addFlash('success', 'part.created_flash');
 
             return $this->redirectToRoute('part_edit', ['id' => $new_part->getID()]);
         }
diff --git a/src/Controller/SecurityController.php b/src/Controller/SecurityController.php
index 16b0e8b8..6cba6a67 100644
--- a/src/Controller/SecurityController.php
+++ b/src/Controller/SecurityController.php
@@ -99,7 +99,7 @@ class SecurityController extends AbstractController
 
         if ($form->isSubmitted() && $form->isValid()) {
             $passwordReset->request($form->getData()['user']);
-            $this->addFlash('success', $this->translator->trans('pw_reset.request.success'));
+            $this->addFlash('success', 'pw_reset.request.success');
             return $this->redirectToRoute('login');
         }
 
@@ -152,9 +152,9 @@ class SecurityController extends AbstractController
             //Try to set the new password
             $success = $passwordReset->setNewPassword($data['username'], $data['token'], $data['new_password']);
             if (!$success) {
-                $this->addFlash('error', $this->translator->trans('pw_reset.new_pw.error'));
+                $this->addFlash('error', 'pw_reset.new_pw.error');
             } else {
-                $this->addFlash('success', $this->translator->trans('pw_reset.new_pw.success'));
+                $this->addFlash('success', 'pw_reset.new_pw.success');
                 return $this->redirectToRoute('login');
             }
         }
diff --git a/src/Form/AdminPages/AttachmentTypeAdminForm.php b/src/Form/AdminPages/AttachmentTypeAdminForm.php
index f0424370..612f4481 100644
--- a/src/Form/AdminPages/AttachmentTypeAdminForm.php
+++ b/src/Form/AdminPages/AttachmentTypeAdminForm.php
@@ -34,10 +34,10 @@ class AttachmentTypeAdminForm extends BaseEntityAdminForm
 {
     protected $filterTools;
 
-    public function __construct(Security $security, ParameterBagInterface $params, TranslatorInterface $trans, FileTypeFilterTools $filterTools)
+    public function __construct(Security $security, ParameterBagInterface $params, FileTypeFilterTools $filterTools)
     {
         $this->filterTools = $filterTools;
-        parent::__construct($security, $params, $trans);
+        parent::__construct($security, $params);
     }
 
     protected function additionalFormElements(FormBuilderInterface $builder, array $options, NamedDBElement $entity)
@@ -45,9 +45,9 @@ class AttachmentTypeAdminForm extends BaseEntityAdminForm
         $is_new = null === $entity->getID();
 
         $builder->add('filetype_filter', TextType::class, ['required' => false,
-            'label' => $this->trans->trans('attachment_type.edit.filetype_filter'),
-            'help' => $this->trans->trans('attachment_type.edit.filetype_filter.help'),
-            'attr' => ['placeholder' => $this->trans->trans('attachment_type.edit.filetype_filter.placeholder')],
+            'label' => 'attachment_type.edit.filetype_filter',
+            'help' => 'attachment_type.edit.filetype_filter.help',
+            'attr' => ['placeholder' => 'attachment_type.edit.filetype_filter.placeholder'],
             'empty_data' => '',
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ]);
 
diff --git a/src/Form/AdminPages/BaseEntityAdminForm.php b/src/Form/AdminPages/BaseEntityAdminForm.php
index c03956ba..0e62c9dc 100644
--- a/src/Form/AdminPages/BaseEntityAdminForm.php
+++ b/src/Form/AdminPages/BaseEntityAdminForm.php
@@ -44,13 +44,11 @@ class BaseEntityAdminForm extends AbstractType
 {
     protected $security;
     protected $params;
-    protected $trans;
 
-    public function __construct(Security $security, ParameterBagInterface $params, TranslatorInterface $trans)
+    public function __construct(Security $security, ParameterBagInterface $params)
     {
         $this->security = $security;
         $this->params = $params;
-        $this->trans = $trans;
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -66,23 +64,23 @@ class BaseEntityAdminForm extends AbstractType
         $is_new = null === $entity->getID();
 
         $builder
-            ->add('name', TextType::class, ['empty_data' => '', 'label' => $this->trans->trans('name.label'),
-                'attr' => ['placeholder' => $this->trans->trans('part.name.placeholder')],
+            ->add('name', TextType::class, ['empty_data' => '', 'label' => 'name.label',
+                'attr' => ['placeholder' =>'part.name.placeholder'],
                 'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ])
 
             ->add('parent', StructuralEntityType::class, ['class' => \get_class($entity),
-                'required' => false, 'label' => $this->trans->trans('parent.label'),
+                'required' => false, 'label' => 'parent.label',
                 'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity), ])
 
             ->add('not_selectable', CheckboxType::class, ['required' => false,
-                'label' => $this->trans->trans('entity.edit.not_selectable'),
-                'help' => $this->trans->trans('entity.edit.not_selectable.help'),
+                'label' => 'entity.edit.not_selectable',
+                'help' => 'entity.edit.not_selectable.help',
                 'label_attr' => ['class' => 'checkbox-custom'],
                 'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ])
 
             ->add('comment', CKEditorType::class, ['required' => false, 'empty_data' => '',
-                'label' => $this->trans->trans('comment.label'),
-                'attr' => ['rows' => 4], 'help' => $this->trans->trans('bbcode.hint'),
+                'label' => 'comment.label',
+                'attr' => ['rows' => 4], 'help' => 'bbcode.hint',
                 'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ]);
 
         $this->additionalFormElements($builder, $options, $entity);
@@ -103,13 +101,13 @@ class BaseEntityAdminForm extends AbstractType
         $builder->add('master_picture_attachment', MasterPictureAttachmentType::class, [
             'required' => false,
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
-            'label' => $this->trans->trans('part.edit.master_attachment'),
+            'label' => 'part.edit.master_attachment',
             'entity' => $entity,
         ]);
 
         //Buttons
         $builder->add('save', SubmitType::class, [
-            'label' => $is_new ? $this->trans->trans('entity.create') : $this->trans->trans('entity.edit.save'),
+            'label' => $is_new ? 'entity.create' : 'entity.edit.save',
             'attr' => ['class' => $is_new ? 'btn-success' : ''],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ])
             ->add('reset', ResetType::class, ['label' => 'entity.edit.reset',
diff --git a/src/Form/AdminPages/CategoryAdminForm.php b/src/Form/AdminPages/CategoryAdminForm.php
index 0b302437..6826d1be 100644
--- a/src/Form/AdminPages/CategoryAdminForm.php
+++ b/src/Form/AdminPages/CategoryAdminForm.php
@@ -33,46 +33,46 @@ class CategoryAdminForm extends BaseEntityAdminForm
         $is_new = null === $entity->getID();
 
         $builder->add('disable_footprints', CheckboxType::class, ['required' => false,
-            'label' => $this->trans->trans('category.edit.disable_footprints'),
-            'help' => $this->trans->trans('category.edit.disable_footprints.help'),
+            'label' => 'category.edit.disable_footprints',
+            'help' => 'category.edit.disable_footprints.help',
             'label_attr' => ['class' => 'checkbox-custom'],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ]);
 
         $builder->add('disable_manufacturers', CheckboxType::class, ['required' => false,
-            'label' => $this->trans->trans('category.edit.disable_manufacturers'),
-            'help' => $this->trans->trans('category.edit.disable_manufacturers.help'),
+            'label' => 'category.edit.disable_manufacturers',
+            'help' => 'category.edit.disable_manufacturers.help',
             'label_attr' => ['class' => 'checkbox-custom'],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ]);
 
         $builder->add('disable_autodatasheets', CheckboxType::class, ['required' => false,
-            'label' => $this->trans->trans('category.edit.disable_autodatasheets'),
-            'help' => $this->trans->trans('category.edit.disable_autodatasheets.help'),
+            'label' => 'category.edit.disable_autodatasheets',
+            'help' => 'category.edit.disable_autodatasheets.help',
             'label_attr' => ['class' => 'checkbox-custom'],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ]);
 
         $builder->add('disable_properties', CheckboxType::class, ['required' => false,
-            'label' => $this->trans->trans('category.edit.disable_properties'),
-            'help' => $this->trans->trans('category.edit.disable_properties.help'),
+            'label' => 'category.edit.disable_properties',
+            'help' => 'category.edit.disable_properties.help',
             'label_attr' => ['class' => 'checkbox-custom'],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ]);
 
         $builder->add('partname_hint', TextType::class, ['required' => false, 'empty_data' => '',
-            'label' => $this->trans->trans('category.edit.partname_hint'),
-            'attr' => ['placeholder' => $this->trans->trans('category.edit.partname_hint.placeholder')],
+            'label' => 'category.edit.partname_hint',
+            'attr' => ['placeholder' => 'category.edit.partname_hint.placeholder'],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ]);
 
         $builder->add('partname_regex', TextType::class, ['required' => false, 'empty_data' => '',
-            'label' => $this->trans->trans('category.edit.partname_regex'),
+            'label' => 'category.edit.partname_regex',
             'attr' => ['placeholder' => 'category.edit.partname_regex.placeholder'],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ]);
 
         $builder->add('default_description', TextType::class, ['required' => false, 'empty_data' => '',
-            'label' => $this->trans->trans('category.edit.default_description'),
-            'attr' => ['placeholder' => $this->trans->trans('category.edit.default_description.placeholder')],
+            'label' => 'category.edit.default_description',
+            'attr' => ['placeholder' => 'category.edit.default_description.placeholder'],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ]);
 
         $builder->add('default_comment', TextType::class, ['required' => false, 'empty_data' => '',
-            'label' => $this->trans->trans('category.edit.default_comment'),
+            'label' => 'category.edit.default_comment',
             'attr' => ['placeholder' => $this->trans->trans('category.edit.default_comment.placeholder')],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ]);
     }
diff --git a/src/Form/AdminPages/CompanyForm.php b/src/Form/AdminPages/CompanyForm.php
index f9f3fe82..80ef8e93 100644
--- a/src/Form/AdminPages/CompanyForm.php
+++ b/src/Form/AdminPages/CompanyForm.php
@@ -35,46 +35,46 @@ class CompanyForm extends BaseEntityAdminForm
         $is_new = null === $entity->getID();
 
         $builder->add('address', TextareaType::class, [
-            'label' => $this->trans->trans('company.edit.address'),
+            'label' => 'company.edit.address',
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
-            'attr' => ['placeholder' => $this->trans->trans('company.edit.address.placeholder')], 'required' => false,
+            'attr' => ['placeholder' => 'company.edit.address.placeholder'], 'required' => false,
             'empty_data' => '',
         ]);
 
         $builder->add('phone_number', TelType::class, [
-            'label' => $this->trans->trans('company.edit.phone_number'),
+            'label' => 'company.edit.phone_number',
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
-            'attr' => ['placeholder' => $this->trans->trans('company.edit.phone_number.placeholder')],
+            'attr' => ['placeholder' => 'company.edit.phone_number.placeholder'],
             'required' => false,
             'empty_data' => '',
         ]);
 
         $builder->add('fax_number', TelType::class, [
-            'label' => $this->trans->trans('company.edit.fax_number'),
+            'label' => 'company.edit.fax_number',
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
             'attr' => ['placeholder' => 'company.fax_number.placeholder'], 'required' => false,
             'empty_data' => '',
         ]);
 
         $builder->add('email_address', EmailType::class, [
-            'label' => $this->trans->trans('company.edit.email'),
+            'label' => 'company.edit.email',
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
-            'attr' => ['placeholder' => $this->trans->trans('company.edit.email.placeholder')], 'required' => false,
+            'attr' => ['placeholder' => 'company.edit.email.placeholder'], 'required' => false,
             'empty_data' => '',
         ]);
 
         $builder->add('website', UrlType::class, [
-            'label' => $this->trans->trans('company.edit.website'),
+            'label' => 'company.edit.website',
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
-            'attr' => ['placeholder' => $this->trans->trans('company.edit.website.placeholder')], 'required' => false,
+            'attr' => ['placeholder' => 'company.edit.website.placeholder'], 'required' => false,
             'empty_data' => '',
         ]);
 
         $builder->add('auto_product_url', UrlType::class, [
-            'label' => $this->trans->trans('company.edit.auto_product_url'),
-            'help' => $this->trans->trans('company.edit.auto_product_url.help'),
+            'label' => 'company.edit.auto_product_url',
+            'help' => 'company.edit.auto_product_url.help',
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity),
-            'attr' => ['placeholder' => $this->trans->trans('company.edit.auto_product_url.placeholder')],
+            'attr' => ['placeholder' => 'company.edit.auto_product_url.placeholder'],
             'required' => false,
             'empty_data' => '',
         ]);
diff --git a/src/Form/AdminPages/CurrencyAdminForm.php b/src/Form/AdminPages/CurrencyAdminForm.php
index d1d022d7..7c2393fd 100644
--- a/src/Form/AdminPages/CurrencyAdminForm.php
+++ b/src/Form/AdminPages/CurrencyAdminForm.php
@@ -34,14 +34,14 @@ class CurrencyAdminForm extends BaseEntityAdminForm
 
         $builder->add('iso_code', CurrencyType::class, [
             'required' => false,
-            'label' => $this->trans->trans('currency.edit.iso_code'),
+            'label' => 'currency.edit.iso_code',
             'preferred_choices' => ['EUR', 'USD', 'GBP', 'JPY', 'CNY'],
             'attr' => ['class' => 'selectpicker', 'data-live-search' => true],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ]);
 
         $builder->add('exchange_rate', MoneyType::class, [
             'required' => false,
-            'label' => $this->trans->trans('currency.edit.exchange_rate'),
+            'label' => 'currency.edit.exchange_rate',
             'currency' => $this->params->get('default_currency'),
             'scale' => 6,
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ]);
diff --git a/src/Form/AdminPages/FootprintAdminForm.php b/src/Form/AdminPages/FootprintAdminForm.php
index efcedf93..284b473d 100644
--- a/src/Form/AdminPages/FootprintAdminForm.php
+++ b/src/Form/AdminPages/FootprintAdminForm.php
@@ -32,7 +32,7 @@ class FootprintAdminForm extends BaseEntityAdminForm
         $builder->add('footprint_3d', MasterPictureAttachmentType::class, [
             'required' => false,
             'disabled' => !$this->security->isGranted(null === $entity->getID() ? 'create' : 'edit', $entity),
-            'label' => $this->trans->trans('footprint.edit.3d_model'),
+            'label' => 'footprint.edit.3d_model',
             'filter' => '3d_model',
             'entity' => $entity,
         ]);
diff --git a/src/Form/AdminPages/ImportType.php b/src/Form/AdminPages/ImportType.php
index a344f417..3d489f18 100644
--- a/src/Form/AdminPages/ImportType.php
+++ b/src/Form/AdminPages/ImportType.php
@@ -36,12 +36,10 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 class ImportType extends AbstractType
 {
     protected $security;
-    protected $trans;
 
-    public function __construct(Security $security, TranslatorInterface $trans)
+    public function __construct(Security $security)
     {
         $this->security = $security;
-        $this->trans = $trans;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -57,33 +55,33 @@ class ImportType extends AbstractType
 
             ->add('format', ChoiceType::class, [
                 'choices' => ['JSON' => 'json', 'XML' => 'xml', 'CSV' => 'csv', 'YAML' => 'yaml'],
-                'label' => $this->trans->trans('export.format'),
+                'label' => 'export.format',
                 'disabled' => $disabled, ])
             ->add('csv_separator', TextType::class, ['data' => ';',
-                'label' => $this->trans->trans('import.csv_separator'),
+                'label' => 'import.csv_separator',
                 'disabled' => $disabled, ]);
 
         if ($entity instanceof StructuralDBElement) {
             $builder->add('parent', StructuralEntityType::class, [
                 'class' => $data['entity_class'],
                 'required' => false,
-                'label' => $this->trans->trans('parent.label'),
+                'label' => 'parent.label',
                 'disabled' => $disabled,
             ]);
         }
 
         $builder->add('file', FileType::class, [
-            'label' => $this->trans->trans('import.file'),
+            'label' => 'import.file',
             'attr' => ['class' => 'file', 'data-show-preview' => 'false', 'data-show-upload' => 'false'],
             'disabled' => $disabled,
         ])
 
             ->add('preserve_children', CheckboxType::class, ['data' => true, 'required' => false,
-                'label' => $this->trans->trans('import.preserve_children'),
+                'label' => 'import.preserve_children',
                 'label_attr' => ['class' => 'checkbox-custom'], 'disabled' => $disabled, ])
             ->add('abort_on_validation_error', CheckboxType::class, ['data' => true, 'required' => false,
-                'label' => $this->trans->trans('import.abort_on_validation'),
-                'help' => $this->trans->trans('import.abort_on_validation.help'),
+                'label' => 'import.abort_on_validation',
+                'help' => 'import.abort_on_validation.help',
                 'label_attr' => ['class' => 'checkbox-custom'], 'disabled' => $disabled, ])
 
             //Buttons
diff --git a/src/Form/AdminPages/MassCreationForm.php b/src/Form/AdminPages/MassCreationForm.php
index 012f49cf..45e3f484 100644
--- a/src/Form/AdminPages/MassCreationForm.php
+++ b/src/Form/AdminPages/MassCreationForm.php
@@ -33,12 +33,10 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 class MassCreationForm extends AbstractType
 {
     protected $security;
-    protected $translator;
 
-    public function __construct(Security $security, TranslatorInterface $translator)
+    public function __construct(Security $security)
     {
         $this->security = $security;
-        $this->translator = $translator;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -52,10 +50,10 @@ class MassCreationForm extends AbstractType
 
         $builder
             ->add('lines', TextareaType::class, ['data' => '',
-                'label' => $this->translator->trans('mass_creation.lines'),
+                'label' => 'mass_creation.lines',
                 'disabled' => $disabled, 'required' => true,
                 'attr' => [
-                    'placeholder' => $this->translator->trans('mass_creation.lines.placeholder'),
+                    'placeholder' => 'mass_creation.lines.placeholder',
                     'rows' => 10,
                 ],
             ]);
@@ -63,13 +61,13 @@ class MassCreationForm extends AbstractType
             $builder->add('parent', StructuralEntityType::class, [
                 'class' => $data['entity_class'],
                 'required' => false,
-                'label' => $this->translator->trans('parent.label'),
+                'label' => 'parent.label',
                 'disabled' => $disabled, ]);
         }
 
         //Buttons
         $builder->add('create', SubmitType::class, [
-                'label' => $this->translator->trans('entity.mass_creation.btn'),
+                'label' => 'entity.mass_creation.btn',
                 'disabled' => $disabled,
             ]);
     }
diff --git a/src/Form/AdminPages/MeasurementUnitAdminForm.php b/src/Form/AdminPages/MeasurementUnitAdminForm.php
index 09413a1f..ffb8b80e 100644
--- a/src/Form/AdminPages/MeasurementUnitAdminForm.php
+++ b/src/Form/AdminPages/MeasurementUnitAdminForm.php
@@ -33,20 +33,20 @@ class MeasurementUnitAdminForm extends BaseEntityAdminForm
         $is_new = null === $entity->getID();
 
         $builder->add('is_integer', CheckboxType::class, ['required' => false,
-            'label' => $this->trans->trans('measurement_unit.edit.is_integer'),
-            'help' => $this->trans->trans('measurement_unit.edit.is_integer.help'),
+            'label' => 'measurement_unit.edit.is_integer',
+            'help' => 'measurement_unit.edit.is_integer.help',
             'label_attr' => ['class' => 'checkbox-custom'],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ]);
 
         $builder->add('use_si_prefix', CheckboxType::class, ['required' => false,
-            'label' => $this->trans->trans('measurement_unit.edit.use_si_prefix'),
-            'help' => $this->trans->trans('measurement_unit.edit.use_si_prefix.help'),
+            'label' => 'measurement_unit.edit.use_si_prefix',
+            'help' => 'measurement_unit.edit.use_si_prefix.help',
             'label_attr' => ['class' => 'checkbox-custom'],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ]);
 
         $builder->add('unit', TextType::class, ['required' => false,
-            'label' => $this->trans->trans('measurement_unit.edit.unit_symbol'),
-            'attr' => ['placeholder' => $this->trans->trans('measurement_unit.edit.unit_symbol.placeholder')],
+            'label' => 'measurement_unit.edit.unit_symbol',
+            'attr' => ['placeholder' => 'measurement_unit.edit.unit_symbol.placeholder'],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'edit', $entity), ]);
     }
 }
diff --git a/src/Form/AdminPages/StorelocationAdminForm.php b/src/Form/AdminPages/StorelocationAdminForm.php
index e284cadb..f6490855 100644
--- a/src/Form/AdminPages/StorelocationAdminForm.php
+++ b/src/Form/AdminPages/StorelocationAdminForm.php
@@ -35,29 +35,29 @@ class StorelocationAdminForm extends BaseEntityAdminForm
 
         $builder->add('is_full', CheckboxType::class, [
             'required' => false,
-            'label' => $this->trans->trans('storelocation.edit.is_full.label'),
-            'help' => $this->trans->trans('storelocation.edit.is_full.help'),
+            'label' => 'storelocation.edit.is_full.label',
+            'help' => 'storelocation.edit.is_full.help',
             'label_attr' => ['class' => 'checkbox-custom'],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity), ]);
 
         $builder->add('limit_to_existing_parts', CheckboxType::class, [
             'required' => false,
-            'label' => $this->trans->trans('storelocation.limit_to_existing.label'),
-            'help' => $this->trans->trans('storelocation.limit_to_existing.help'),
+            'label' => 'storelocation.limit_to_existing.label',
+            'help' => 'storelocation.limit_to_existing.help',
             'label_attr' => ['class' => 'checkbox-custom'],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity), ]);
 
         $builder->add('only_single_part', CheckboxType::class, [
             'required' => false,
-            'label' => $this->trans->trans('storelocation.only_single_part.label'),
-            'help' => $this->trans->trans('storelocation.only_single_part.help'),
+            'label' => 'storelocation.only_single_part.label',
+            'help' => 'storelocation.only_single_part.help',
             'label_attr' => ['class' => 'checkbox-custom'],
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity), ]);
 
         $builder->add('storage_type', StructuralEntityType::class, [
             'required' => false,
-            'label' => $this->trans->trans('storelocation.storage_type.label'),
-            'help' => $this->trans->trans('storelocation.storage_type.help'),
+            'label' => 'storelocation.storage_type.label',
+            'help' => 'storelocation.storage_type.help',
             'class' => MeasurementUnit::class, 'disable_not_selectable' => true,
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity), ]);
     }
diff --git a/src/Form/AdminPages/SupplierForm.php b/src/Form/AdminPages/SupplierForm.php
index 327e72dd..326e09ea 100644
--- a/src/Form/AdminPages/SupplierForm.php
+++ b/src/Form/AdminPages/SupplierForm.php
@@ -38,7 +38,7 @@ class SupplierForm extends CompanyForm
         $builder->add('default_currency', StructuralEntityType::class, [
             'class' => Currency::class,
             'required' => false,
-            'label' => $this->trans->trans('supplier.edit.default_currency'),
+            'label' => 'supplier.edit.default_currency',
             'disable_not_selectable' => true,
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity), ]);
 
@@ -46,7 +46,7 @@ class SupplierForm extends CompanyForm
             'required' => false,
             'currency' => $this->params->get('default_currency'),
             'scale' => 3,
-            'label' => $this->trans->trans('supplier.shipping_costs.label'),
+            'label' => 'supplier.shipping_costs.label',
             'disabled' => !$this->security->isGranted($is_new ? 'create' : 'move', $entity),
         ]);
     }
diff --git a/src/Form/AttachmentFormType.php b/src/Form/AttachmentFormType.php
index 477a8c4a..f06f6374 100644
--- a/src/Form/AttachmentFormType.php
+++ b/src/Form/AttachmentFormType.php
@@ -43,15 +43,13 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 class AttachmentFormType extends AbstractType
 {
     protected $attachment_helper;
-    protected $trans;
     protected $urlGenerator;
     protected $allow_attachments_download;
 
-    public function __construct(AttachmentManager $attachmentHelper, TranslatorInterface $trans,
+    public function __construct(AttachmentManager $attachmentHelper,
                                 UrlGeneratorInterface $urlGenerator, bool $allow_attachments_downloads)
     {
         $this->attachment_helper = $attachmentHelper;
-        $this->trans = $trans;
         $this->urlGenerator = $urlGenerator;
         $this->allow_attachments_download = $allow_attachments_downloads;
     }
@@ -59,50 +57,50 @@ class AttachmentFormType extends AbstractType
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add('name', TextType::class, [
-            'label' => $this->trans->trans('attachment.edit.name'),
+            'label' => 'attachment.edit.name',
         ])
             ->add('attachment_type', StructuralEntityType::class, [
-                'label' => $this->trans->trans('attachment.edit.attachment_type'),
+                'label' => 'attachment.edit.attachment_type',
                 'class' => AttachmentType::class,
                 'disable_not_selectable' => true,
                 'attr' => ['class' => 'attachment_type_selector'],
             ]);
 
         $builder->add('showInTable', CheckboxType::class, ['required' => false,
-            'label' => $this->trans->trans('attachment.edit.show_in_table'),
+            'label' => 'attachment.edit.show_in_table',
             'attr' => ['class' => 'form-control-sm'],
             'label_attr' => ['class' => 'checkbox-custom'], ]);
 
         $builder->add('secureFile', CheckboxType::class, ['required' => false,
-            'label' => $this->trans->trans('attachment.edit.secure_file'),
+            'label' => 'attachment.edit.secure_file',
             'mapped' => false,
             'attr' => ['class' => 'form-control-sm'],
-            'help' => $this->trans->trans('attachment.edit.secure_file.help'),
+            'help' => 'attachment.edit.secure_file.help',
             'label_attr' => ['class' => 'checkbox-custom'], ]);
 
         $builder->add('url', TextType::class, [
-            'label' => $this->trans->trans('attachment.edit.url'),
+            'label' => 'attachment.edit.url',
             'required' => false,
             'attr' => [
                 'data-autocomplete' => $this->urlGenerator->generate('typeahead_builtInRessources', ['query' => 'QUERY']),
                 //Disable browser autocomplete
                 'autocomplete' => 'off',
             ],
-            'help' => $this->trans->trans('attachment.edit.url.help'),
+            'help' => 'attachment.edit.url.help',
             'constraints' => [
                 $options['allow_builtins'] ? new UrlOrBuiltin() : new Url(),
             ],
         ]);
 
         $builder->add('downloadURL', CheckboxType::class, ['required' => false,
-            'label' => $this->trans->trans('attachment.edit.download_url'),
+            'label' => 'attachment.edit.download_url',
             'mapped' => false,
             'disabled' => !$this->allow_attachments_download,
             'attr' => ['class' => 'form-control-sm'],
             'label_attr' => ['class' => 'checkbox-custom'], ]);
 
         $builder->add('file', FileType::class, [
-            'label' => $this->trans->trans('attachment.edit.file'),
+            'label' => 'attachment.edit.file',
             'mapped' => false,
             'required' => false,
             'attr' => ['class' => 'file', 'data-show-preview' => 'false', 'data-show-upload' => 'false'],
diff --git a/src/Form/Part/OrderdetailType.php b/src/Form/Part/OrderdetailType.php
index 2d1bbfaf..6ab7c118 100644
--- a/src/Form/Part/OrderdetailType.php
+++ b/src/Form/Part/OrderdetailType.php
@@ -40,12 +40,10 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class OrderdetailType extends AbstractType
 {
-    protected $trans;
     protected $security;
 
-    public function __construct(TranslatorInterface $trans, Security $security)
+    public function __construct( Security $security)
     {
-        $this->trans = $trans;
         $this->security = $security;
     }
 
@@ -55,27 +53,27 @@ class OrderdetailType extends AbstractType
         $orderdetail = $builder->getData();
 
         $builder->add('supplierpartnr', TextType::class, [
-            'label' => $this->trans->trans('orderdetails.edit.supplierpartnr'),
-            'attr' => ['placeholder' => $this->trans->trans('orderdetails.edit.supplierpartnr.placeholder')],
+            'label' => 'orderdetails.edit.supplierpartnr',
+            'attr' => ['placeholder' => 'orderdetails.edit.supplierpartnr.placeholder'],
             'required' => false,
             'empty_data' => '',
         ]);
 
         $builder->add('supplier', StructuralEntityType::class, [
             'class' => Supplier::class, 'disable_not_selectable' => true,
-            'label' => $this->trans->trans('orderdetails.edit.supplier'),
+            'label' => 'orderdetails.edit.supplier',
         ]);
 
         $builder->add('supplier_product_url', UrlType::class, [
             'required' => false,
             'empty_data' => '',
-            'label' => $this->trans->trans('orderdetails.edit.url'),
+            'label' => 'orderdetails.edit.url',
         ]);
 
         $builder->add('obsolete', CheckboxType::class, [
             'required' => false,
             'label_attr' => ['class' => 'checkbox-custom'],
-            'label' => $this->trans->trans('orderdetails.edit.obsolete'),
+            'label' => 'orderdetails.edit.obsolete',
         ]);
 
         //Add pricedetails after we know the data, so we can set the default currency
diff --git a/src/Form/Part/PartBaseType.php b/src/Form/Part/PartBaseType.php
index e549be04..75fb8e6d 100644
--- a/src/Form/Part/PartBaseType.php
+++ b/src/Form/Part/PartBaseType.php
@@ -54,10 +54,9 @@ class PartBaseType extends AbstractType
     protected $trans;
     protected $urlGenerator;
 
-    public function __construct(Security $security, TranslatorInterface $trans, UrlGeneratorInterface $urlGenerator)
+    public function __construct(Security $security, UrlGeneratorInterface $urlGenerator)
     {
         $this->security = $security;
-        $this->trans = $trans;
         $this->urlGenerator = $urlGenerator;
     }
 
@@ -67,52 +66,52 @@ class PartBaseType extends AbstractType
         $part = $builder->getData();
 
         $status_choices = [
-            $this->trans->trans('m_status.unknown') => '',
-            $this->trans->trans('m_status.announced') => 'announced',
-            $this->trans->trans('m_status.active') => 'active',
-            $this->trans->trans('m_status.nrfnd') => 'nrfnd',
-            $this->trans->trans('m_status.eol') => 'eol',
-            $this->trans->trans('m_status.discontinued') => 'discontinued',
+            'm_status.unknown' => '',
+            'm_status.announced' => 'announced',
+            'm_status.active' => 'active',
+            'm_status.nrfnd' => 'nrfnd',
+            'm_status.eol' => 'eol',
+            'm_status.discontinued' => 'discontinued',
         ];
 
         //Common section
         $builder
             ->add('name', TextType::class, [
                 'empty_data' => '',
-                'label' => $this->trans->trans('part.edit.name'),
-                'attr' => ['placeholder' => $this->trans->trans('part.edit.name.placeholder')],
+                'label' => 'part.edit.name',
+                'attr' => ['placeholder' => 'part.edit.name.placeholder'],
                 'disabled' => !$this->security->isGranted('name.edit', $part),
             ])
             ->add('description', CKEditorType::class, [
                 'required' => false,
                 'empty_data' => '',
-                'label' => $this->trans->trans('part.edit.description'),
+                'label' => 'part.edit.description',
                 'config_name' => 'description_config',
-                'attr' => ['placeholder' => $this->trans->trans('part.edit.description.placeholder'), 'rows' => 2],
+                'attr' => ['placeholder' => 'part.edit.description.placeholder', 'rows' => 2],
                 'disabled' => !$this->security->isGranted('description.edit', $part),
             ])
             ->add('minAmount', SIUnitType::class, [
-                'attr' => ['min' => 0, 'placeholder' => $this->trans->trans('part.editmininstock.placeholder')],
-                'label' => $this->trans->trans('part.edit.mininstock'),
+                'attr' => ['min' => 0, 'placeholder' => 'part.editmininstock.placeholder'],
+                'label' => 'part.edit.mininstock',
                 'measurement_unit' => $part->getPartUnit(),
                 'disabled' => !$this->security->isGranted('minamount.edit', $part),
             ])
             ->add('category', StructuralEntityType::class, [
                 'class' => Category::class,
-                'label' => $this->trans->trans('part.edit.category'),
+                'label' => 'part.edit.category',
                 'disable_not_selectable' => true,
                 'disabled' => !$this->security->isGranted('category.edit', $part),
             ])
             ->add('footprint', StructuralEntityType::class, [
                 'class' => Footprint::class,
                 'required' => false,
-                'label' => $this->trans->trans('part.edit.footprint'),
+                'label' => 'part.edit.footprint',
                 'disable_not_selectable' => true,
                 'disabled' => !$this->security->isGranted('footprint.edit', $part),
             ])
             ->add('tags', TextType::class, [
                 'required' => false,
-                'label' => $this->trans->trans('part.edit.tags'),
+                'label' => 'part.edit.tags',
                 'empty_data' => '',
                 'attr' => [
                     'class' => 'tagsinput',
@@ -124,23 +123,23 @@ class PartBaseType extends AbstractType
         $builder->add('manufacturer', StructuralEntityType::class, [
             'class' => Manufacturer::class,
             'required' => false,
-            'label' => $this->trans->trans('part.edit.manufacturer.label'),
+            'label' => 'part.edit.manufacturer.label',
             'disable_not_selectable' => true,
             'disabled' => !$this->security->isGranted('manufacturer.edit', $part),
             ])
             ->add('manufacturer_product_url', UrlType::class, [
                 'required' => false,
                 'empty_data' => '',
-                'label' => $this->trans->trans('part.edit.manufacturer_url.label'),
+                'label' => 'part.edit.manufacturer_url.label',
                 'disabled' => !$this->security->isGranted('mpn.edit', $part),
             ])
             ->add('manufacturer_product_number', TextType::class, [
                 'required' => false,
                 'empty_data' => '',
-                'label' => $this->trans->trans('part.edit.mpn'),
+                'label' => 'part.edit.mpn',
                 'disabled' => !$this->security->isGranted('mpn.edit', $part), ])
             ->add('manufacturing_status', ChoiceType::class, [
-                'label' => $this->trans->trans('part.edit.manufacturing_status'),
+                'label' => 'part.edit.manufacturing_status',
                 'choices' => $status_choices,
                 'required' => false,
                 'disabled' => !$this->security->isGranted('status.edit', $part),
@@ -150,18 +149,18 @@ class PartBaseType extends AbstractType
         $builder->add('needsReview', CheckboxType::class, [
             'label_attr' => ['class' => 'checkbox-custom'],
             'required' => false,
-            'label' => $this->trans->trans('part.edit.needs_review'),
+            'label' => 'part.edit.needs_review',
             'disabled' => !$this->security->isGranted('edit', $part),
         ])
             ->add('favorite', CheckboxType::class, [
                 'label_attr' => ['class' => 'checkbox-custom'],
                 'required' => false,
-                'label' => $this->trans->trans('part.edit.is_favorite'),
+                'label' => 'part.edit.is_favorite',
                 'disabled' => !$this->security->isGranted('change_favorite', $part),
             ])
             ->add('mass', SIUnitType::class, [
                 'unit' => 'g',
-                'label' => $this->trans->trans('part.edit.mass'),
+                'label' => 'part.edit.mass',
                 'required' => false,
                 'disabled' => !$this->security->isGranted('mass.edit', $part),
             ])
@@ -169,14 +168,14 @@ class PartBaseType extends AbstractType
                 'class' => MeasurementUnit::class,
                 'required' => false,
                 'disable_not_selectable' => true,
-                'label' => $this->trans->trans('part.edit.partUnit'),
+                'label' => 'part.edit.partUnit',
                 'disabled' => !$this->security->isGranted('unit.edit', $part),
             ]);
 
         //Comment section
         $builder->add('comment', CKEditorType::class, [
             'required' => false,
-            'label' => $this->trans->trans('part.edit.comment'),
+            'label' => 'part.edit.comment',
             'attr' => ['rows' => 4],
             'disabled' => !$this->security->isGranted('comment.edit', $part), 'empty_data' => '',
         ]);
@@ -210,7 +209,7 @@ class PartBaseType extends AbstractType
         $builder->add('master_picture_attachment', MasterPictureAttachmentType::class, [
             'required' => false,
             'disabled' => !$this->security->isGranted('attachments.edit', $part),
-            'label' => $this->trans->trans('part.edit.master_attachment'),
+            'label' => 'part.edit.master_attachment',
             'entity' => $part,
         ]);
 
@@ -230,8 +229,8 @@ class PartBaseType extends AbstractType
 
         $builder
             //Buttons
-            ->add('save', SubmitType::class, ['label' => $this->trans->trans('part.edit.save')])
-            ->add('reset', ResetType::class, ['label' => $this->trans->trans('part.edit.reset')]);
+            ->add('save', SubmitType::class, ['label' => 'part.edit.save'])
+            ->add('reset', ResetType::class, ['label' => 'part.edit.reset']);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Form/Part/PartLotType.php b/src/Form/Part/PartLotType.php
index d2b2cdbc..f7776e87 100644
--- a/src/Form/Part/PartLotType.php
+++ b/src/Form/Part/PartLotType.php
@@ -37,26 +37,24 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 class PartLotType extends AbstractType
 {
-    protected $trans;
     protected $security;
 
-    public function __construct(TranslatorInterface $trans, Security $security)
+    public function __construct(Security $security)
     {
-        $this->trans = $trans;
         $this->security = $security;
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder->add('description', TextType::class, [
-            'label' => $this->trans->trans('part_lot.edit.description'),
+            'label' => 'part_lot.edit.description',
             'required' => false,
             'empty_data' => '',
             'attr' => ['class' => 'form-control-sm'],
         ]);
 
         $builder->add('storage_location', StructuralEntityType::class, ['class' => Storelocation::class,
-            'label' => $this->trans->trans('part_lot.edit.location'),
+            'label' => 'part_lot.edit.location',
             'required' => false,
             'disable_not_selectable' => true,
             'attr' => ['class' => 'selectpicker form-control-sm', 'data-live-search' => true],
@@ -64,29 +62,29 @@ class PartLotType extends AbstractType
 
         $builder->add('amount', SIUnitType::class, [
             'measurement_unit' => $options['measurement_unit'],
-            'label' => $this->trans->trans('part_lot.edit.amount'),
+            'label' => 'part_lot.edit.amount',
             'attr' => ['class' => 'form-control-sm'],
         ]);
 
         $builder->add('instock_unknown', CheckboxType::class, ['required' => false,
-            'label' => $this->trans->trans('part_lot.edit.instock_unknown'),
+            'label' => 'part_lot.edit.instock_unknown',
             'attr' => ['class' => 'form-control-sm'],
             'label_attr' => ['class' => 'checkbox-custom'],
         ]);
 
         $builder->add('needs_refill', CheckboxType::class, ['label_attr' => ['class' => 'checkbox-custom'],
-            'label' => $this->trans->trans('part_lot.edit.needs_refill'),
+            'label' => 'part_lot.edit.needs_refill',
             'attr' => ['class' => 'form-control-sm'],
             'required' => false,
         ]);
 
         $builder->add('expirationDate', DateTimeType::class, [
-            'label' => $this->trans->trans('part_lot.edit.expiration_date'),
+            'label' => 'part_lot.edit.expiration_date',
             'attr' => [],
             'required' => false, ]);
 
         $builder->add('comment', TextType::class, [
-            'label' => $this->trans->trans('part_lot.edit.comment'),
+            'label' => 'part_lot.edit.comment',
             'attr' => ['class' => 'form-control-sm'],
             'required' => false, 'empty_data' => '',
         ]);
diff --git a/src/Form/Part/PricedetailType.php b/src/Form/Part/PricedetailType.php
index d81a772d..5790e59a 100644
--- a/src/Form/Part/PricedetailType.php
+++ b/src/Form/Part/PricedetailType.php
@@ -36,14 +36,17 @@ class PricedetailType extends AbstractType
     {
         //No labels needed, we define translation in templates
         $builder->add('min_discount_quantity', SIUnitType::class, [
+            'label' => false,
             'measurement_unit' => $options['measurement_unit'],
             'attr' => ['class' => 'form-control-sm'],
         ]);
         $builder->add('price_related_quantity', SIUnitType::class, [
+            'label' => false,
             'measurement_unit' => $options['measurement_unit'],
             'attr' => ['class' => 'form-control-sm'],
         ]);
         $builder->add('price', NumberType::class, [
+            'label' => false,
             'scale' => 5,
             'html5' => true,
             'attr' => ['min' => 0, 'step' => 'any'],
diff --git a/src/Form/Type/SIUnitType.php b/src/Form/Type/SIUnitType.php
index 2e3b22c9..0e9d1f61 100644
--- a/src/Form/Type/SIUnitType.php
+++ b/src/Form/Type/SIUnitType.php
@@ -102,6 +102,7 @@ class SIUnitType extends AbstractType implements DataMapperInterface
     {
         $builder
             ->add('value', NumberType::class, [
+                'label' => false,
                 'html5' => $options['html5'],
                 'attr' => [
                     'min' => (string) $options['min'],
@@ -112,6 +113,7 @@ class SIUnitType extends AbstractType implements DataMapperInterface
 
         if ($options['show_prefix']) {
             $builder->add('prefix', ChoiceType::class, [
+                'label' => 'false',
                 'choices' => ['M' => 6, 'k' => 3, '' => 0, 'm' => -3, 'µ' => -6],
             ]);
         }
diff --git a/src/Form/UserAdminForm.php b/src/Form/UserAdminForm.php
index f9514dac..f8bcafb1 100644
--- a/src/Form/UserAdminForm.php
+++ b/src/Form/UserAdminForm.php
@@ -49,12 +49,10 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 class UserAdminForm extends AbstractType
 {
     protected $security;
-    protected $trans;
 
-    public function __construct(Security $security, TranslatorInterface $trans)
+    public function __construct(Security $security)
     {
         $this->security = $security;
-        $this->trans = $trans;
     }
 
     public function configureOptions(OptionsResolver $resolver)
@@ -72,44 +70,44 @@ class UserAdminForm extends AbstractType
         $builder
             ->add('name', TextType::class, [
                 'empty_data' => '',
-                'label' => $this->trans->trans('user.username.label'),
-                'attr' => ['placeholder' => $this->trans->trans('user.username.placeholder')],
+                'label' => 'user.username.label',
+                'attr' => ['placeholder' => 'user.username.placeholder'],
                 'disabled' => !$this->security->isGranted('edit_username', $entity),
             ])
 
             ->add('group', StructuralEntityType::class, [
                 'class' => Group::class,
                 'required' => false,
-                'label' => $this->trans->trans('group.label'),
+                'label' => 'group.label',
                 'disable_not_selectable' => true,
                 'disabled' => !$this->security->isGranted('change_group', $entity), ])
 
             ->add('first_name', TextType::class, [
                 'empty_data' => '',
-                'label' => $this->trans->trans('user.firstName.label'),
-                'attr' => ['placeholder' => $this->trans->trans('user.firstName.placeholder')], 'required' => false,
+                'label' => 'user.firstName.label',
+                'attr' => ['placeholder' => 'user.firstName.placeholder'], 'required' => false,
                 'disabled' => !$this->security->isGranted('edit_infos', $entity),
             ])
 
             ->add('last_name', TextType::class, [
                 'empty_data' => '',
-                'label' => $this->trans->trans('user.lastName.label'),
-                'attr' => ['placeholder' => $this->trans->trans('user.lastName.placeholder')],
+                'label' => 'user.lastName.label',
+                'attr' => ['placeholder' => 'user.lastName.placeholder'],
                 'required' => false,
                 'disabled' => !$this->security->isGranted('edit_infos', $entity),
             ])
 
             ->add('email', TextType::class, [
                 'empty_data' => '',
-                'label' => $this->trans->trans('user.email.label'),
-                'attr' => ['placeholder' => $this->trans->trans('user.email.placeholder')],
+                'label' => 'user.email.label',
+                'attr' => ['placeholder' => 'user.email.placeholder'],
                 'required' => false,
                 'disabled' => !$this->security->isGranted('edit_infos', $entity), ])
 
             ->add('department', TextType::class, [
                 'empty_data' => '',
-                'label' => $this->trans->trans('user.department.label'),
-                'attr' => ['placeholder' => $this->trans->trans('user.department.placeholder')],
+                'label' => 'user.department.label',
+                'attr' => ['placeholder' => 'user.department.placeholder'],
                 'required' => false,
                 'disabled' => !$this->security->isGranted('edit_infos', $entity),
             ])
@@ -118,16 +116,16 @@ class UserAdminForm extends AbstractType
             ->add('language', LanguageType::class, [
                 'required' => false,
                 'attr' => ['class' => 'selectpicker', 'data-live-search' => true],
-                'placeholder' => $this->trans->trans('user_settings.language.placeholder'),
-                'label' => $this->trans->trans('user.language_select'),
+                'placeholder' => 'user_settings.language.placeholder',
+                'label' => 'user.language_select',
                 'preferred_choices' => ['en', 'de'],
                 'disabled' => !$this->security->isGranted('change_user_settings', $entity),
             ])
             ->add('timezone', TimezoneType::class, [
                 'required' => false,
                 'attr' => ['class' => 'selectpicker', 'data-live-search' => true],
-                'placeholder' => $this->trans->trans('user_settings.timezone.placeholder'),
-                'label' => $this->trans->trans('user.timezone.label'),
+                'placeholder' => 'user_settings.timezone.placeholder',
+                'label' => 'user.timezone.label',
                 'preferred_choices' => ['Europe/Berlin'],
                 'disabled' => !$this->security->isGranted('change_user_settings', $entity),
             ])
@@ -138,20 +136,20 @@ class UserAdminForm extends AbstractType
                     return $value;
                 },
                 'attr' => ['class' => 'selectpicker'],
-                'placeholder' => $this->trans->trans('user_settings.theme.placeholder'),
-                'label' => $this->trans->trans('user.theme.label'),
+                'placeholder' => 'user_settings.theme.placeholder',
+                'label' => 'user.theme.label',
                 'disabled' => !$this->security->isGranted('change_user_settings', $entity),
             ])
             ->add('currency', CurrencyEntityType::class, [
                 'required' => false,
-                'label' => $this->trans->trans('user.currency.label'),
+                'label' => 'user.currency.label',
                 'disabled' => !$this->security->isGranted('change_user_settings', $entity),
             ])
 
             ->add('new_password', RepeatedType::class, [
                 'type' => PasswordType::class,
-                'first_options' => ['label' => $this->trans->trans('user.settings.pw_new.label')],
-                'second_options' => ['label' => $this->trans->trans('user.settings.pw_confirm.label')],
+                'first_options' => ['label' => 'user.settings.pw_new.label'],
+                'second_options' => ['label' => 'user.settings.pw_confirm.label'],
                 'invalid_message' => 'password_must_match',
                 'required' => false,
                 'mapped' => false,
@@ -165,14 +163,14 @@ class UserAdminForm extends AbstractType
             ->add('need_pw_change', CheckboxType::class, [
                 'required' => false,
                 'label_attr' => ['class' => 'checkbox-custom'],
-                'label' => $this->trans->trans('user.edit.needs_pw_change'),
+                'label' => 'user.edit.needs_pw_change',
                 'disabled' => !$this->security->isGranted('set_password', $entity),
             ])
 
             ->add('disabled', CheckboxType::class, [
                 'required' => false,
                 'label_attr' => ['class' => 'checkbox-custom'],
-                'label' => $this->trans->trans('user.edit.user_disabled'),
+                'label' => 'user.edit.user_disabled',
                 'disabled' => !$this->security->isGranted('set_password', $entity)
                     || $entity === $this->security->getUser(),
             ])
@@ -205,11 +203,11 @@ class UserAdminForm extends AbstractType
 
         //Buttons
         $builder->add('save', SubmitType::class, [
-            'label' => $is_new ? $this->trans->trans('user.create') : $this->trans->trans('user.edit.save'),
+            'label' => $is_new ? 'user.create' : 'user.edit.save',
             'attr' => ['class' => $is_new ? 'btn-success' : ''],
         ])
             ->add('reset', ResetType::class, [
-                'label' => $this->trans->trans('entity.edit.reset'),
+                'label' => 'entity.edit.reset',
             ]);
     }
 
diff --git a/src/Form/UserSettingsType.php b/src/Form/UserSettingsType.php
index e6f4dfe0..25093923 100644
--- a/src/Form/UserSettingsType.php
+++ b/src/Form/UserSettingsType.php
@@ -39,15 +39,11 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 class UserSettingsType extends AbstractType
 {
     protected $security;
-
-    protected $trans;
-
     protected $demo_mode;
 
-    public function __construct(Security $security, TranslatorInterface $trans, bool $demo_mode)
+    public function __construct(Security $security, bool $demo_mode)
     {
         $this->security = $security;
-        $this->trans = $trans;
         $this->demo_mode = $demo_mode;
     }
 
@@ -55,43 +51,43 @@ class UserSettingsType extends AbstractType
     {
         $builder
             ->add('name', TextType::class, [
-                'label' => $this->trans->trans('user.username.label'),
+                'label' => 'user.username.label',
                 'disabled' => !$this->security->isGranted('edit_username', $options['data']) || $this->demo_mode,
             ])
             ->add('first_name', TextType::class, [
                 'required' => false,
-                'label' => $this->trans->trans('user.firstName.label'),
+                'label' => 'user.firstName.label',
                 'disabled' => !$this->security->isGranted('edit_infos', $options['data']) || $this->demo_mode,
             ])
             ->add('last_name', TextType::class, [
                 'required' => false,
-                'label' => $this->trans->trans('user.lastName.label'),
+                'label' => 'user.lastName.label',
                 'disabled' => !$this->security->isGranted('edit_infos', $options['data']) || $this->demo_mode,
             ])
             ->add('department', TextType::class, [
                 'required' => false,
-                'label' => $this->trans->trans('user.department.label'),
+                'label' => 'user.department.label',
                 'disabled' => !$this->security->isGranted('edit_infos', $options['data']) || $this->demo_mode,
             ])
             ->add('email', EmailType::class, [
                 'required' => false,
-                'label' => $this->trans->trans('user.email.label'),
+                'label' => 'user.email.label',
                 'disabled' => !$this->security->isGranted('edit_infos', $options['data']) || $this->demo_mode,
             ])
             ->add('language', LanguageType::class, [
                 'disabled' => $this->demo_mode,
                 'required' => false,
                 'attr' => ['class' => 'selectpicker', 'data-live-search' => true],
-                'placeholder' => $this->trans->trans('user_settings.language.placeholder'),
-                'label' => $this->trans->trans('user.language_select'),
+                'placeholder' => 'user_settings.language.placeholder',
+                'label' => 'user.language_select',
                 'preferred_choices' => ['en', 'de'],
                 ])
             ->add('timezone', TimezoneType::class, [
                 'disabled' => $this->demo_mode,
                 'required' => false,
                 'attr' => ['class' => 'selectpicker', 'data-live-search' => true],
-                'placeholder' => $this->trans->trans('user_settings.timezone.placeholder'),
-                'label' => $this->trans->trans('user.timezone.label'),
+                'placeholder' => 'user_settings.timezone.placeholder',
+                'label' => 'user.timezone.label',
                 'preferred_choices' => ['Europe/Berlin'],
                 ])
             ->add('theme', ChoiceType::class, [
@@ -102,13 +98,13 @@ class UserSettingsType extends AbstractType
                 'choice_label' => function ($entity, $key, $value) {
                     return $value;
                 },
-                'placeholder' => $this->trans->trans('user_settings.theme.placeholder'),
-                'label' => $this->trans->trans('user.theme.label'),
+                'placeholder' => 'user_settings.theme.placeholder',
+                'label' => 'user.theme.label',
                 ])
             ->add('currency', CurrencyEntityType::class, [
                 'disabled' => $this->demo_mode,
                 'required' => false,
-                'label' => $this->trans->trans('user.currency.label'),
+                'label' => 'user.currency.label',
             ])
 
             //Buttons
diff --git a/src/Services/GitVersionInfo.php b/src/Services/GitVersionInfo.php
index ddc0a0c5..b0cbaf2e 100644
--- a/src/Services/GitVersionInfo.php
+++ b/src/Services/GitVersionInfo.php
@@ -52,7 +52,7 @@ class GitVersionInfo
     /**
      * Get hash of the last git commit (on remote "origin"!).
      *
-     * @note    If this method does not work, try to make a "git pull" first!
+     * If this method does not work, try to make a "git pull" first!
      *
      * @param int $length if this is smaller than 40, only the first $length characters will be returned
      *
diff --git a/templates/_flash.html.twig b/templates/_flash.html.twig
index 583f88e8..2a38ca1a 100644
--- a/templates/_flash.html.twig
+++ b/templates/_flash.html.twig
@@ -23,7 +23,7 @@
                     </button>
                 </div>
                 <div class="toast-body {{ flash_bg }}">
-                    {{ message}}
+                    {{ message | trans}}
                 </div>
             </div>
         {% endfor %}
diff --git a/translations/messages.de.xlf b/translations/messages.de.xlf
index be5989bf..18932f71 100644
--- a/translations/messages.de.xlf
+++ b/translations/messages.de.xlf
@@ -475,7 +475,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="4_pqNGT" name="export.format">
       <notes>
         <note category="file-source" priority="1">templates\AdminPages\_export_form.html.twig:4</note>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:60</note>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:56</note>
         <note priority="1">templates\AdminPages\_export_form.html.twig:4</note>
         <note priority="1">src\Form\ImportType.php:67</note>
       </notes>
@@ -1173,7 +1173,6 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
       <notes>
         <note category="file-source" priority="1">templates\Parts\info\show_part_info.html.twig:46</note>
         <note category="file-source" priority="1">templates\_navbar.html.twig:46</note>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:84</note>
         <note priority="1">templates\base.html.twig:62</note>
         <note priority="1">templates\Parts\show_part_info.html.twig:74</note>
         <note priority="1">src\Form\PartType.php:86</note>
@@ -1915,8 +1914,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="PwI64fM" name="user.firstName.label">
       <notes>
         <note category="file-source" priority="1">templates\Users\user_info.html.twig:18</note>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:89</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:63</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:57</note>
         <note priority="1">templates\Users\user_info.html.twig:18</note>
         <note priority="1">src\Form\UserSettingsType.php:32</note>
       </notes>
@@ -1928,8 +1926,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="u2ayBIA" name="user.lastName.label">
       <notes>
         <note category="file-source" priority="1">templates\Users\user_info.html.twig:24</note>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:96</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:68</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:62</note>
         <note priority="1">templates\Users\user_info.html.twig:24</note>
         <note priority="1">src\Form\UserSettingsType.php:35</note>
       </notes>
@@ -1941,8 +1938,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="cDu6Rok" name="user.email.label">
       <notes>
         <note category="file-source" priority="1">templates\Users\user_info.html.twig:30</note>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:104</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:78</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:72</note>
         <note priority="1">templates\Users\user_info.html.twig:30</note>
         <note priority="1">src\Form\UserSettingsType.php:41</note>
       </notes>
@@ -1954,8 +1950,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="8GGUFm1" name="user.department.label">
       <notes>
         <note category="file-source" priority="1">templates\Users\user_info.html.twig:37</note>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:111</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:73</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:67</note>
         <note priority="1">templates\Users\user_info.html.twig:37</note>
         <note priority="1">src\Form\UserSettingsType.php:38</note>
       </notes>
@@ -1967,8 +1962,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="oX4P2rM" name="user.username.label">
       <notes>
         <note category="file-source" priority="1">templates\Users\user_info.html.twig:47</note>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:75</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:58</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:53</note>
         <note priority="1">templates\Users\user_info.html.twig:47</note>
         <note priority="1">src\Form\UserSettingsType.php:30</note>
       </notes>
@@ -1980,7 +1974,6 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="QK5x4IY" name="group.label">
       <notes>
         <note category="file-source" priority="1">templates\Users\user_info.html.twig:53</note>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:83</note>
         <note category="file-source" priority="1">src\Services\ElementTypeNameGenerator.php:70</note>
         <note priority="1">templates\Users\user_info.html.twig:53</note>
       </notes>
@@ -2065,7 +2058,6 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="kTRK6H_" name="name.label">
       <notes>
         <note category="file-source" priority="1">templates\_navbar.html.twig:30</note>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:69</note>
         <note priority="1">templates\base.html.twig:54</note>
         <note priority="1">src\Form\PartType.php:62</note>
       </notes>
@@ -2190,8 +2182,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="oabvQfM" name="user.language_select">
       <notes>
         <note category="file-source" priority="1">templates\_navbar.html.twig:115</note>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:122</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:86</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:77</note>
         <note priority="1">templates\base.html.twig:106</note>
         <note priority="1">src\Form\UserSettingsType.php:44</note>
       </notes>
@@ -2297,41 +2288,37 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="A7i8za4" name="entity.edit_flash">
       <notes>
         <note category="file-source" priority="1">src\Controller\AdminPages\BaseAdminController.php:110</note>
-        <note category="state" priority="1">new</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>entity.edit_flash</source>
-        <target></target>
+        <target>Änderungen erfolgreich gespeichert.</target>
       </segment>
     </unit>
     <unit id="AoZHore" name="entity.edit_flash.invalid">
       <notes>
         <note category="file-source" priority="1">src\Controller\AdminPages\BaseAdminController.php:116</note>
-        <note category="state" priority="1">new</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>entity.edit_flash.invalid</source>
-        <target></target>
+        <target>Änderungen konnten nicht gespeichert werden! Prüfen Sie ihre Eingaben!</target>
       </segment>
     </unit>
     <unit id="8MJvWmd" name="entity.created_flash">
       <notes>
         <note category="file-source" priority="1">src\Controller\AdminPages\BaseAdminController.php:166</note>
-        <note category="state" priority="1">new</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>entity.created_flash</source>
-        <target></target>
+        <target>Element erfolgreich angelegt!</target>
       </segment>
     </unit>
     <unit id="zZdZuYS" name="entity.created_flash.invalid">
       <notes>
         <note category="file-source" priority="1">src\Controller\AdminPages\BaseAdminController.php:172</note>
-        <note category="state" priority="1">new</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>entity.created_flash.invalid</source>
-        <target></target>
+        <target>Element konnte nicht angelegt werden! Prüfen Sie ihre Eingaben!</target>
       </segment>
     </unit>
     <unit id="lSfR7sD" name="attachment_type.deleted">
@@ -2348,77 +2335,10 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="2bvWUoo" name="csfr_invalid">
       <notes>
         <note category="file-source" priority="1">src\Controller\AdminPages\BaseAdminController.php:257</note>
-        <note category="state" priority="1">new</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>csfr_invalid</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="6IyG_kn" name="Success Flash Message!">
-      <notes>
-        <note category="file-source" priority="1">src\Controller\DebugController.php:38</note>
-        <note priority="1">src\Controller\DebugController.php:45</note>
-        <note priority="1">new</note>
-      </notes>
-      <segment>
-        <source>Success Flash Message!</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="Efur0Zp" name="Error Flash Message!">
-      <notes>
-        <note category="file-source" priority="1">src\Controller\DebugController.php:39</note>
-        <note priority="1">src\Controller\DebugController.php:46</note>
-        <note priority="1">new</note>
-      </notes>
-      <segment>
-        <source>Error Flash Message!</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="BRCmXY4" name="Warning Flash Message!">
-      <notes>
-        <note category="file-source" priority="1">src\Controller\DebugController.php:40</note>
-        <note priority="1">src\Controller\DebugController.php:47</note>
-        <note priority="1">new</note>
-      </notes>
-      <segment>
-        <source>Warning Flash Message!</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="Upm6RvH" name="Notice Flash Message!">
-      <notes>
-        <note category="file-source" priority="1">src\Controller\DebugController.php:41</note>
-        <note priority="1">src\Controller\DebugController.php:48</note>
-        <note priority="1">new</note>
-      </notes>
-      <segment>
-        <source>Notice Flash Message!</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="p1634fX" name="Info Flash Message! &lt;b&gt;Test&lt;/b&gt;">
-      <notes>
-        <note category="file-source" priority="1">src\Controller\DebugController.php:42</note>
-        <note priority="1">src\Controller\DebugController.php:49</note>
-        <note priority="1">new</note>
-      </notes>
-      <segment>
-        <source>Info Flash Message! &lt;b&gt;Test&lt;/b&gt;</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="UJki1El" name="Blabla. This message type should be not know to template!">
-      <notes>
-        <note category="file-source" priority="1">src\Controller\DebugController.php:44</note>
-        <note priority="1">src\Controller\DebugController.php:51</note>
-        <note priority="1">new</note>
-      </notes>
-      <segment>
-        <source>Blabla. This message type should be not know to template!</source>
-        <target></target>
+        <target>CSFR-Token ungültig! Laden Sie diese Seite erneut oder kontaktieren Sie einen Administrator, wenn das Problem bestehen bleibt!</target>
       </segment>
     </unit>
     <unit id="lZvhKYu" name="validator.noneofitschild.self">
@@ -2615,11 +2535,10 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="suYw2UL" name="part.deleted">
       <notes>
         <note category="file-source" priority="1">src\Controller\PartController.php:133</note>
-        <note category="state" priority="1">new</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>part.deleted</source>
-        <target></target>
+        <target>Bauteil erfolgreich gelöscht.</target>
       </segment>
     </unit>
     <unit id="tG.Jfwp" name="part.created_flash">
@@ -2732,7 +2651,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="3ZnUiT_" name="attachment.edit.name">
       <notes>
         <note category="file-source" priority="1">src\DataTables\AttachmentDataTable.php:89</note>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:62</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:59</note>
       </notes>
       <segment>
         <source>attachment.edit.name</source>
@@ -2780,7 +2699,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="xUV7Oz9" name="attachment.edit.show_in_table">
       <notes>
         <note category="file-source" priority="1">src\DataTables\AttachmentDataTable.php:169</note>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:72</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:69</note>
       </notes>
       <segment>
         <source>attachment.edit.show_in_table</source>
@@ -2963,7 +2882,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
       <notes>
         <note category="file-source" priority="1">src\DataTables\PartsDataTable.php:272</note>
         <note category="file-source" priority="1">src\DataTables\PartsDataTable.php:274</note>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:70</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:68</note>
       </notes>
       <segment>
         <source>m_status.unknown</source>
@@ -2973,7 +2892,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="BEnlUff" name="m_status.announced">
       <notes>
         <note category="file-source" priority="1">src\DataTables\PartsDataTable.php:275</note>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:71</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:68</note>
       </notes>
       <segment>
         <source>m_status.announced</source>
@@ -2983,7 +2902,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="TN5xR7J" name="m_status.active">
       <notes>
         <note category="file-source" priority="1">src\DataTables\PartsDataTable.php:276</note>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:72</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:68</note>
       </notes>
       <segment>
         <source>m_status.active</source>
@@ -2993,7 +2912,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="0McKh_8" name="m_status.nrfnd">
       <notes>
         <note category="file-source" priority="1">src\DataTables\PartsDataTable.php:277</note>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:73</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:68</note>
       </notes>
       <segment>
         <source>m_status.nrfnd</source>
@@ -3003,7 +2922,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="L7yLwn0" name="m_status.eol">
       <notes>
         <note category="file-source" priority="1">src\DataTables\PartsDataTable.php:278</note>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:74</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:68</note>
       </notes>
       <segment>
         <source>m_status.eol</source>
@@ -3013,7 +2932,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     <unit id="5jxVP1H" name="m_status.discontinued">
       <notes>
         <note category="file-source" priority="1">src\DataTables\PartsDataTable.php:279</note>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:75</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:68</note>
       </notes>
       <segment>
         <source>m_status.discontinued</source>
@@ -3065,236 +2984,6 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
         <target state="translated">Login erfolgreich.</target>
       </segment>
     </unit>
-    <unit id="dxkuAbb" name="attachment_type.edit.filetype_filter">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\AttachmentTypeAdminForm.php:48</note>
-      </notes>
-      <segment>
-        <source>attachment_type.edit.filetype_filter</source>
-        <target state="translated">Erlaubte Dateitypen</target>
-      </segment>
-    </unit>
-    <unit id="1KMaa2P" name="attachment_type.edit.filetype_filter.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\AttachmentTypeAdminForm.php:49</note>
-      </notes>
-      <segment>
-        <source>attachment_type.edit.filetype_filter.help</source>
-        <target state="translated">Sie können hier eine kommaseparierte Liste von Dateiendungen oder Mimetypen angeben, die eine hochgeladene Datei mit diesem Anhangstyp haben muss. Um alle unterstützten Bilddateien zu erlauben, kann image/* benutzt werden.</target>
-      </segment>
-    </unit>
-    <unit id="wkNc9Pm" name="attachment_type.edit.filetype_filter.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\AttachmentTypeAdminForm.php:50</note>
-      </notes>
-      <segment>
-        <source>attachment_type.edit.filetype_filter.placeholder</source>
-        <target state="translated">z.B. .txt, application/pdf, image/*</target>
-      </segment>
-    </unit>
-    <unit id="nEC2Xzw" name="part.name.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:70</note>
-        <note priority="1">src\Form\PartType.php:63</note>
-      </notes>
-      <segment>
-        <source>part.name.placeholder</source>
-        <target>z.B. BC547</target>
-      </segment>
-    </unit>
-    <unit id="dmNi.3b" name="parent.label">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:74</note>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:70</note>
-        <note category="file-source" priority="1">src\Form\AdminPages\MassCreationForm.php:66</note>
-        <note priority="1">src\Form\ImportType.php:72</note>
-      </notes>
-      <segment>
-        <source>parent.label</source>
-        <target>Übergeordnetes Element</target>
-      </segment>
-    </unit>
-    <unit id="SDbrzIT" name="entity.edit.not_selectable">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:78</note>
-      </notes>
-      <segment>
-        <source>entity.edit.not_selectable</source>
-        <target state="translated">Nicht auswählbar</target>
-      </segment>
-    </unit>
-    <unit id="5aUSkZz" name="entity.edit.not_selectable.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:79</note>
-      </notes>
-      <segment>
-        <source>entity.edit.not_selectable.help</source>
-        <target state="translated">Wenn diese Option aktiviert ist, dann kann dieses Element keinem Bauteil als Eigenschaft zugewiesen werden. Hilfreich z.B. wenn dieses Element nur der reinen Sortierung dienen soll.</target>
-      </segment>
-    </unit>
-    <unit id="en0DwC3" name="bbcode.hint">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:85</note>
-      </notes>
-      <segment>
-        <source>bbcode.hint</source>
-        <target state="translated">Hier kann BBCode verwendet werden (z.B. [b]Fett[/b])</target>
-      </segment>
-    </unit>
-    <unit id="cIVLqUs" name="part.edit.master_attachment">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:106</note>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:213</note>
-      </notes>
-      <segment>
-        <source>part.edit.master_attachment</source>
-        <target state="translated">Vorschaubild</target>
-      </segment>
-    </unit>
-    <unit id="Q5hCjzL" name="entity.create">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:112</note>
-      </notes>
-      <segment>
-        <source>entity.create</source>
-        <target state="translated">Element anlegen</target>
-      </segment>
-    </unit>
-    <unit id="bBoYWyf" name="entity.edit.save">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:112</note>
-      </notes>
-      <segment>
-        <source>entity.edit.save</source>
-        <target state="translated">Speichern</target>
-      </segment>
-    </unit>
-    <unit id="HeL2lAW" name="category.edit.disable_footprints">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:36</note>
-      </notes>
-      <segment>
-        <source>category.edit.disable_footprints</source>
-        <target state="translated">Deaktiviere Footprints</target>
-      </segment>
-    </unit>
-    <unit id="lpS1zKs" name="category.edit.disable_footprints.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:37</note>
-      </notes>
-      <segment>
-        <source>category.edit.disable_footprints.help</source>
-        <target state="translated">Wenn diese Option aktiviert ist, ist die Footprint Eigenschaft für alle Bauteile in dieser Kategorie, deaktiviert.</target>
-      </segment>
-    </unit>
-    <unit id="1w_nFL7" name="category.edit.disable_manufacturers">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:42</note>
-      </notes>
-      <segment>
-        <source>category.edit.disable_manufacturers</source>
-        <target state="translated">Deaktiviere Hersteller</target>
-      </segment>
-    </unit>
-    <unit id="tNK6Sfl" name="category.edit.disable_manufacturers.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:43</note>
-      </notes>
-      <segment>
-        <source>category.edit.disable_manufacturers.help</source>
-        <target state="translated">Wenn diese Option aktiviert ist, ist die Hersteller Eigenschaft für alle Bauteile in dieser Kategorie, deaktiviert.</target>
-      </segment>
-    </unit>
-    <unit id="HOZICfA" name="category.edit.disable_autodatasheets">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:48</note>
-      </notes>
-      <segment>
-        <source>category.edit.disable_autodatasheets</source>
-        <target state="translated">Deaktiviere Automatische Datenblatt links</target>
-      </segment>
-    </unit>
-    <unit id="5HWLQAL" name="category.edit.disable_autodatasheets.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:49</note>
-      </notes>
-      <segment>
-        <source>category.edit.disable_autodatasheets.help</source>
-        <target state="translated">Wenn diese Option aktiviert ist, werden für Bauteile mit dieser Kategorie keine automatischen Datenblattlinks erzeugt.</target>
-      </segment>
-    </unit>
-    <unit id="lfFBz4D" name="category.edit.disable_properties">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:54</note>
-      </notes>
-      <segment>
-        <source>category.edit.disable_properties</source>
-        <target state="translated">Deaktiviere Eigenschaften</target>
-      </segment>
-    </unit>
-    <unit id="gu7SqNR" name="category.edit.disable_properties.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:55</note>
-      </notes>
-      <segment>
-        <source>category.edit.disable_properties.help</source>
-        <target state="translated">Wenn diese Option aktiviert ist, sind die Bauteileeigenschaften für alle Bauteile in dieser Kategorie, deaktiviert.</target>
-      </segment>
-    </unit>
-    <unit id="0FP6XeT" name="category.edit.partname_hint">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:60</note>
-      </notes>
-      <segment>
-        <source>category.edit.partname_hint</source>
-        <target state="translated">Namenshinweis</target>
-      </segment>
-    </unit>
-    <unit id="BG4G_f9" name="category.edit.partname_hint.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:61</note>
-      </notes>
-      <segment>
-        <source>category.edit.partname_hint.placeholder</source>
-        <target state="translated">z.B. 100nF</target>
-      </segment>
-    </unit>
-    <unit id="LbTbeDm" name="category.edit.partname_regex">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:65</note>
-      </notes>
-      <segment>
-        <source>category.edit.partname_regex</source>
-        <target state="translated">Namensfilter</target>
-      </segment>
-    </unit>
-    <unit id="UH78POJ" name="category.edit.default_description">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:70</note>
-      </notes>
-      <segment>
-        <source>category.edit.default_description</source>
-        <target state="translated">Standard Beschreibung</target>
-      </segment>
-    </unit>
-    <unit id="8hlqVRs" name="category.edit.default_description.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:71</note>
-      </notes>
-      <segment>
-        <source>category.edit.default_description.placeholder</source>
-        <target state="translated">z.B. Kondensator, 10mmx10mm, SMD</target>
-      </segment>
-    </unit>
-    <unit id="QMPrbSY" name="category.edit.default_comment">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:75</note>
-      </notes>
-      <segment>
-        <source>category.edit.default_comment</source>
-        <target state="translated">Standard Kommentar</target>
-      </segment>
-    </unit>
     <unit id="ths2hVl" name="category.edit.default_comment.placeholder">
       <notes>
         <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:76</note>
@@ -3304,194 +2993,9 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
         <target state="translated">e.g. Nützlich für Schaltnetzteile</target>
       </segment>
     </unit>
-    <unit id="KN33Vgx" name="company.edit.address">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:38</note>
-      </notes>
-      <segment>
-        <source>company.edit.address</source>
-        <target state="translated">Anschrift</target>
-      </segment>
-    </unit>
-    <unit id="AMjZLA3" name="company.edit.address.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:40</note>
-      </notes>
-      <segment>
-        <source>company.edit.address.placeholder</source>
-        <target state="translated">Musterstraße 314
-31415 Beispielhausen</target>
-      </segment>
-    </unit>
-    <unit id="WoyE_3B" name="company.edit.phone_number">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:45</note>
-      </notes>
-      <segment>
-        <source>company.edit.phone_number</source>
-        <target state="translated">Telefonnummer</target>
-      </segment>
-    </unit>
-    <unit id="VSMS9Jw" name="company.edit.phone_number.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:47</note>
-      </notes>
-      <segment>
-        <source>company.edit.phone_number.placeholder</source>
-        <target state="translated">+49 12345 6789</target>
-      </segment>
-    </unit>
-    <unit id="khUB2so" name="company.edit.fax_number">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:53</note>
-      </notes>
-      <segment>
-        <source>company.edit.fax_number</source>
-        <target state="translated">Faxnummer</target>
-      </segment>
-    </unit>
-    <unit id="63TXMfg" name="company.edit.email">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:60</note>
-      </notes>
-      <segment>
-        <source>company.edit.email</source>
-        <target state="translated">Email Addresse</target>
-      </segment>
-    </unit>
-    <unit id="vTq5HxO" name="company.edit.email.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:62</note>
-      </notes>
-      <segment>
-        <source>company.edit.email.placeholder</source>
-        <target state="translated">contact@foo.bar</target>
-      </segment>
-    </unit>
-    <unit id="jv3fl1U" name="company.edit.website">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:67</note>
-      </notes>
-      <segment>
-        <source>company.edit.website</source>
-        <target state="translated">Website</target>
-      </segment>
-    </unit>
-    <unit id="fCwuIQc" name="company.edit.website.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:69</note>
-      </notes>
-      <segment>
-        <source>company.edit.website.placeholder</source>
-        <target state="translated">https://www.foo.bar</target>
-      </segment>
-    </unit>
-    <unit id="l4BUu.S" name="company.edit.auto_product_url">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:74</note>
-      </notes>
-      <segment>
-        <source>company.edit.auto_product_url</source>
-        <target state="translated">Produkt URL</target>
-      </segment>
-    </unit>
-    <unit id="UaJhZGe" name="company.edit.auto_product_url.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:75</note>
-      </notes>
-      <segment>
-        <source>company.edit.auto_product_url.help</source>
-        <target state="translated">Wenn diese URL gesetzt ist, wird sie benutzt um die URL eines Bauteils auf der Website des Herstellers zu erzeugen. Dabei wird %PARTNR% mit der Bestellnummer ersetzt.</target>
-      </segment>
-    </unit>
-    <unit id="22S3ulf" name="company.edit.auto_product_url.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:77</note>
-      </notes>
-      <segment>
-        <source>company.edit.auto_product_url.placeholder</source>
-        <target state="translated">https://foo.bar/product/%PARTNR%</target>
-      </segment>
-    </unit>
-    <unit id="NZUfSAR" name="currency.edit.iso_code">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CurrencyAdminForm.php:37</note>
-      </notes>
-      <segment>
-        <source>currency.edit.iso_code</source>
-        <target state="translated">ISO Code</target>
-      </segment>
-    </unit>
-    <unit id="9YIkqmF" name="currency.edit.exchange_rate">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CurrencyAdminForm.php:44</note>
-      </notes>
-      <segment>
-        <source>currency.edit.exchange_rate</source>
-        <target state="translated">Wechselkurs</target>
-      </segment>
-    </unit>
-    <unit id="n496LjY" name="footprint.edit.3d_model">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\FootprintAdminForm.php:35</note>
-      </notes>
-      <segment>
-        <source>footprint.edit.3d_model</source>
-        <target state="translated">3D Modell</target>
-      </segment>
-    </unit>
-    <unit id="Peaf8Qu" name="import.csv_separator">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:63</note>
-        <note priority="1">src\Form\ImportType.php:70</note>
-      </notes>
-      <segment>
-        <source>import.csv_separator</source>
-        <target>CSV Trennzeichen</target>
-      </segment>
-    </unit>
-    <unit id="VteZCnR" name="import.file">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:76</note>
-        <note priority="1">src\Form\ImportType.php:75</note>
-      </notes>
-      <segment>
-        <source>import.file</source>
-        <target>Datei</target>
-      </segment>
-    </unit>
-    <unit id="0ybwwKw" name="import.preserve_children">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:82</note>
-        <note priority="1">src\Form\ImportType.php:78</note>
-      </notes>
-      <segment>
-        <source>import.preserve_children</source>
-        <target>Importiere auch Unterelemente</target>
-      </segment>
-    </unit>
-    <unit id="yyIAudL" name="import.abort_on_validation">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:85</note>
-        <note priority="1">src\Form\ImportType.php:80</note>
-      </notes>
-      <segment>
-        <source>import.abort_on_validation</source>
-        <target>Breche bei Invaliden Daten ab</target>
-      </segment>
-    </unit>
-    <unit id="_JM6Jxg" name="import.abort_on_validation.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:86</note>
-      </notes>
-      <segment>
-        <source>import.abort_on_validation.help</source>
-        <target state="translated">Wenn diese Option aktivert ist, wird beim erkennen ungültiger Daten der gesamte Vorgang abgebrochen. Ist diese Option nicht aktiv, werden ungültige Einträge ignoriert und versucht die anderen Einträge zu importieren.</target>
-      </segment>
-    </unit>
     <unit id="2xohoLw" name="JSON">
       <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:59</note>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:57</note>
         <note priority="1">src\Form\ImportType.php:68</note>
       </notes>
       <segment>
@@ -3501,7 +3005,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     </unit>
     <unit id="QGWOmvj" name="XML">
       <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:59</note>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:57</note>
         <note priority="1">src\Form\ImportType.php:68</note>
       </notes>
       <segment>
@@ -3511,7 +3015,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     </unit>
     <unit id="62tC9Ux" name="CSV">
       <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:59</note>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:57</note>
         <note priority="1">src\Form\ImportType.php:68</note>
       </notes>
       <segment>
@@ -3521,7 +3025,7 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
     </unit>
     <unit id="m26KvkJ" name="YAML">
       <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:59</note>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:57</note>
         <note priority="1">src\Form\ImportType.php:68</note>
       </notes>
       <segment>
@@ -3529,9 +3033,68 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
         <target>YAML</target>
       </segment>
     </unit>
+    <unit id="_JM6Jxg" name="import.abort_on_validation.help">
+      <notes>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:84</note>
+      </notes>
+      <segment>
+        <source>import.abort_on_validation.help</source>
+        <target state="translated">Wenn diese Option aktivert ist, wird beim erkennen ungültiger Daten der gesamte Vorgang abgebrochen. Ist diese Option nicht aktiv, werden ungültige Einträge ignoriert und versucht die anderen Einträge zu importieren.</target>
+      </segment>
+    </unit>
+    <unit id="Peaf8Qu" name="import.csv_separator">
+      <notes>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:60</note>
+        <note priority="1">src\Form\ImportType.php:70</note>
+      </notes>
+      <segment>
+        <source>import.csv_separator</source>
+        <target>CSV Trennzeichen</target>
+      </segment>
+    </unit>
+    <unit id="dmNi.3b" name="parent.label">
+      <notes>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:65</note>
+        <note priority="1">src\Form\ImportType.php:72</note>
+      </notes>
+      <segment>
+        <source>parent.label</source>
+        <target>Übergeordnetes Element</target>
+      </segment>
+    </unit>
+    <unit id="VteZCnR" name="import.file">
+      <notes>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:73</note>
+        <note priority="1">src\Form\ImportType.php:75</note>
+      </notes>
+      <segment>
+        <source>import.file</source>
+        <target>Datei</target>
+      </segment>
+    </unit>
+    <unit id="0ybwwKw" name="import.preserve_children">
+      <notes>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:79</note>
+        <note priority="1">src\Form\ImportType.php:78</note>
+      </notes>
+      <segment>
+        <source>import.preserve_children</source>
+        <target>Importiere auch Unterelemente</target>
+      </segment>
+    </unit>
+    <unit id="yyIAudL" name="import.abort_on_validation">
+      <notes>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:82</note>
+        <note priority="1">src\Form\ImportType.php:80</note>
+      </notes>
+      <segment>
+        <source>import.abort_on_validation</source>
+        <target>Breche bei Invaliden Daten ab</target>
+      </segment>
+    </unit>
     <unit id="d0GsgCW" name="import.btn">
       <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:90</note>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:88</note>
         <note priority="1">src\Form\ImportType.php:85</note>
       </notes>
       <segment>
@@ -3539,182 +3102,27 @@ Subelemente werden beim Löschen nach oben verschoben.</target>
         <target>Importieren</target>
       </segment>
     </unit>
-    <unit id="bxMaU3Y" name="mass_creation.lines">
+    <unit id="_z1YTpv" name="attachment.edit.secure_file.help">
       <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MassCreationForm.php:55</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:78</note>
       </notes>
       <segment>
-        <source>mass_creation.lines</source>
-        <target state="translated">Eingabe</target>
+        <source>attachment.edit.secure_file.help</source>
+        <target state="translated">Auf ein Anhang der als privat gekennzeichnet ist, kann nur durch einen angemeldeten Benutzer zugegriffen werden, der die entsprechende Berechtigung besitzt. Wenn diese Option aktiv ist, werden keine Thumbnails erzeugt, und der Zugriff auf die Datei ist langsamer.</target>
       </segment>
     </unit>
-    <unit id="nIwyuSG" name="mass_creation.lines.placeholder">
+    <unit id="pCsSiaz" name="attachment.edit.url.help">
       <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MassCreationForm.php:58</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:89</note>
       </notes>
       <segment>
-        <source>mass_creation.lines.placeholder</source>
-        <target state="translated">Element 1
-Element 2
-Element 3</target>
-      </segment>
-    </unit>
-    <unit id="yOi8.bI" name="entity.mass_creation.btn">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MassCreationForm.php:72</note>
-      </notes>
-      <segment>
-        <source>entity.mass_creation.btn</source>
-        <target state="translated">Anlegen</target>
-      </segment>
-    </unit>
-    <unit id="oqwo_n5" name="measurement_unit.edit.is_integer">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MeasurementUnitAdminForm.php:36</note>
-      </notes>
-      <segment>
-        <source>measurement_unit.edit.is_integer</source>
-        <target state="translated">Ganzzahlig</target>
-      </segment>
-    </unit>
-    <unit id="ks8LoMb" name="measurement_unit.edit.is_integer.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MeasurementUnitAdminForm.php:37</note>
-      </notes>
-      <segment>
-        <source>measurement_unit.edit.is_integer.help</source>
-        <target state="translated">Wenn diese Option aktiviert ist, werden alle Mengen in dieser Einheit auf ganze Zahlen gerundet.</target>
-      </segment>
-    </unit>
-    <unit id=".TAAW6t" name="measurement_unit.edit.use_si_prefix">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MeasurementUnitAdminForm.php:42</note>
-      </notes>
-      <segment>
-        <source>measurement_unit.edit.use_si_prefix</source>
-        <target state="translated">Benutze SI Prefixe</target>
-      </segment>
-    </unit>
-    <unit id="EZh.nn7" name="measurement_unit.edit.use_si_prefix.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MeasurementUnitAdminForm.php:43</note>
-      </notes>
-      <segment>
-        <source>measurement_unit.edit.use_si_prefix.help</source>
-        <target state="translated">Wenn diese Option aktiviert ist, werden bei Ausgabe der Zahlen SI Prefixe benutzt (z.B. 1,2kg anstatt 1200g)</target>
-      </segment>
-    </unit>
-    <unit id="zha3lRe" name="measurement_unit.edit.unit_symbol">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MeasurementUnitAdminForm.php:48</note>
-      </notes>
-      <segment>
-        <source>measurement_unit.edit.unit_symbol</source>
-        <target state="translated">Einheitensymbol</target>
-      </segment>
-    </unit>
-    <unit id="AxSvu9V" name="measurement_unit.edit.unit_symbol.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MeasurementUnitAdminForm.php:49</note>
-      </notes>
-      <segment>
-        <source>measurement_unit.edit.unit_symbol.placeholder</source>
-        <target state="translated">z.B. m</target>
-      </segment>
-    </unit>
-    <unit id="L68lNgx" name="storelocation.edit.is_full.label">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\StorelocationAdminForm.php:38</note>
-      </notes>
-      <segment>
-        <source>storelocation.edit.is_full.label</source>
-        <target state="translated">Lagerort voll</target>
-      </segment>
-    </unit>
-    <unit id="dsw_ivP" name="storelocation.edit.is_full.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\StorelocationAdminForm.php:39</note>
-      </notes>
-      <segment>
-        <source>storelocation.edit.is_full.help</source>
-        <target state="translated">Wenn diese Option aktiviert ist, ist es weder möglich neue Bauteile zu diesem Lagerort hinzuzufügen, noch die Anzahl bereits vorhandener Bauteile zu erhöhen.</target>
-      </segment>
-    </unit>
-    <unit id="jenFqgq" name="storelocation.limit_to_existing.label">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\StorelocationAdminForm.php:45</note>
-      </notes>
-      <segment>
-        <source>storelocation.limit_to_existing.label</source>
-        <target state="translated">Nur bestehende Bauteile</target>
-      </segment>
-    </unit>
-    <unit id="ftawtbm" name="storelocation.limit_to_existing.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\StorelocationAdminForm.php:46</note>
-      </notes>
-      <segment>
-        <source>storelocation.limit_to_existing.help</source>
-        <target state="translated">Wenn diese Option aktiv ist, ist es nicht möglich neue Bauteile zu diesem Lagerort hinzuzufügen, es ist aber möglich die Anzahl bereits vorhandener Bauteile zu erhöhen.</target>
-      </segment>
-    </unit>
-    <unit id="1DWk7ny" name="storelocation.only_single_part.label">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\StorelocationAdminForm.php:52</note>
-      </notes>
-      <segment>
-        <source>storelocation.only_single_part.label</source>
-        <target state="translated">Nur ein ein Bauteil</target>
-      </segment>
-    </unit>
-    <unit id="np0unjZ" name="storelocation.only_single_part.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\StorelocationAdminForm.php:53</note>
-      </notes>
-      <segment>
-        <source>storelocation.only_single_part.help</source>
-        <target state="translated">Wenn diese Option aktiviert ist, kann dieser Lagerort nur ein einzelnes Bauteil aber in beliebiger Menge fassen. Hilfreich für kleine SMD Fächer oder Feeder.</target>
-      </segment>
-    </unit>
-    <unit id="AE1UiRe" name="storelocation.storage_type.label">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\StorelocationAdminForm.php:59</note>
-      </notes>
-      <segment>
-        <source>storelocation.storage_type.label</source>
-        <target state="translated">Lagertyp</target>
-      </segment>
-    </unit>
-    <unit id="3UBRYaM" name="storelocation.storage_type.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\StorelocationAdminForm.php:60</note>
-      </notes>
-      <segment>
-        <source>storelocation.storage_type.help</source>
-        <target state="translated">Hier kann eine Maßeinheit gewählt werden, die ein Bauteil haben muss, damit es in diesem Lagerort gelagert werden kann.</target>
-      </segment>
-    </unit>
-    <unit id="xBJM0.O" name="supplier.edit.default_currency">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\SupplierForm.php:41</note>
-      </notes>
-      <segment>
-        <source>supplier.edit.default_currency</source>
-        <target state="translated">Standardwährung</target>
-      </segment>
-    </unit>
-    <unit id="9o2s0eF" name="supplier.shipping_costs.label">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\SupplierForm.php:49</note>
-      </notes>
-      <segment>
-        <source>supplier.shipping_costs.label</source>
-        <target state="translated">Versandkosten</target>
+        <source>attachment.edit.url.help</source>
+        <target state="translated">Hier kann entweder eine URL zu einer externen Datei eingetragen werden, oder es wird durch Eingabe eines Stichwortes in den eingebauten Ressourcen gesucht (z.B. Footprints).</target>
       </segment>
     </unit>
     <unit id="kAlm7LR" name="attachment.edit.attachment_type">
       <notes>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:65</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:62</note>
       </notes>
       <segment>
         <source>attachment.edit.attachment_type</source>
@@ -3723,43 +3131,25 @@ Element 3</target>
     </unit>
     <unit id="v6FVutS" name="attachment.edit.secure_file">
       <notes>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:77</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:74</note>
       </notes>
       <segment>
         <source>attachment.edit.secure_file</source>
         <target state="translated">Privater Anhang</target>
       </segment>
     </unit>
-    <unit id="_z1YTpv" name="attachment.edit.secure_file.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:80</note>
-      </notes>
-      <segment>
-        <source>attachment.edit.secure_file.help</source>
-        <target state="translated">Auf ein Anhang der als privat gekennzeichnet ist, kann nur durch einen angemeldeten Benutzer zugegriffen werden, der die entsprechende Berechtigung besitzt. Wenn diese Option aktiv ist, werden keine Thumbnails erzeugt, und der Zugriff auf die Datei ist langsamer.</target>
-      </segment>
-    </unit>
     <unit id="TRy0RSZ" name="attachment.edit.url">
       <notes>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:84</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:81</note>
       </notes>
       <segment>
         <source>attachment.edit.url</source>
         <target state="translated">URL</target>
       </segment>
     </unit>
-    <unit id="pCsSiaz" name="attachment.edit.url.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:91</note>
-      </notes>
-      <segment>
-        <source>attachment.edit.url.help</source>
-        <target state="translated">Hier kann entweder eine URL zu einer externen Datei eingetragen werden, oder es wird durch Eingabe eines Stichwortes in den eingebauten Ressourcen gesucht (z.B. Footprints).</target>
-      </segment>
-    </unit>
     <unit id="ZZjrGgS" name="attachment.edit.download_url">
       <notes>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:98</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:95</note>
       </notes>
       <segment>
         <source>attachment.edit.download_url</source>
@@ -3768,7 +3158,7 @@ Element 3</target>
     </unit>
     <unit id="Pew.kQr" name="attachment.edit.file">
       <notes>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:105</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:102</note>
       </notes>
       <segment>
         <source>attachment.edit.file</source>
@@ -3777,25 +3167,16 @@ Element 3</target>
     </unit>
     <unit id="jv6wCpP" name="orderdetails.edit.supplierpartnr">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:58</note>
+        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:55</note>
       </notes>
       <segment>
         <source>orderdetails.edit.supplierpartnr</source>
         <target state="translated">Bestellnummer</target>
       </segment>
     </unit>
-    <unit id="7r_nI9R" name="orderdetails.edit.supplierpartnr.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:59</note>
-      </notes>
-      <segment>
-        <source>orderdetails.edit.supplierpartnr.placeholder</source>
-        <target state="translated">z.B. BC 547C</target>
-      </segment>
-    </unit>
     <unit id="CimWRtu" name="orderdetails.edit.supplier">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:66</note>
+        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:62</note>
       </notes>
       <segment>
         <source>orderdetails.edit.supplier</source>
@@ -3804,7 +3185,7 @@ Element 3</target>
     </unit>
     <unit id="qfScBBj" name="orderdetails.edit.url">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:72</note>
+        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:67</note>
       </notes>
       <segment>
         <source>orderdetails.edit.url</source>
@@ -3813,61 +3194,43 @@ Element 3</target>
     </unit>
     <unit id="D_288lV" name="orderdetails.edit.obsolete">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:78</note>
+        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:73</note>
       </notes>
       <segment>
         <source>orderdetails.edit.obsolete</source>
         <target state="translated">Nicht mehr lieferbar</target>
       </segment>
     </unit>
+    <unit id="7r_nI9R" name="orderdetails.edit.supplierpartnr.placeholder">
+      <notes>
+        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:57</note>
+      </notes>
+      <segment>
+        <source>orderdetails.edit.supplierpartnr.placeholder</source>
+        <target state="translated">z.B. BC 547C</target>
+      </segment>
+    </unit>
     <unit id="HZwLFnu" name="part.edit.name">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:82</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:79</note>
       </notes>
       <segment>
         <source>part.edit.name</source>
         <target state="translated">Name</target>
       </segment>
     </unit>
-    <unit id="wN.sxj3" name="part.edit.name.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:83</note>
-      </notes>
-      <segment>
-        <source>part.edit.name.placeholder</source>
-        <target state="translated">z.B. BC547</target>
-      </segment>
-    </unit>
     <unit id="9MhdLlK" name="part.edit.description">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:89</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:85</note>
       </notes>
       <segment>
         <source>part.edit.description</source>
         <target state="translated">Beschreibung</target>
       </segment>
     </unit>
-    <unit id="rMHwTBI" name="part.edit.description.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:91</note>
-      </notes>
-      <segment>
-        <source>part.edit.description.placeholder</source>
-        <target state="translated">z.B.  NPN 45V 0,1A 0,5W</target>
-      </segment>
-    </unit>
-    <unit id=".V3Lfkf" name="part.editmininstock.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:95</note>
-      </notes>
-      <segment>
-        <source>part.editmininstock.placeholder</source>
-        <target state="translated">e.g. 1</target>
-      </segment>
-    </unit>
     <unit id="Xzj9BP8" name="part.edit.mininstock">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:96</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:93</note>
       </notes>
       <segment>
         <source>part.edit.mininstock</source>
@@ -3876,7 +3239,7 @@ Element 3</target>
     </unit>
     <unit id="1VN9ldj" name="part.edit.category">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:102</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:99</note>
       </notes>
       <segment>
         <source>part.edit.category</source>
@@ -3885,7 +3248,7 @@ Element 3</target>
     </unit>
     <unit id="IROdosg" name="part.edit.footprint">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:109</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:105</note>
       </notes>
       <segment>
         <source>part.edit.footprint</source>
@@ -3894,7 +3257,7 @@ Element 3</target>
     </unit>
     <unit id="KHkWjTz" name="part.edit.tags">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:115</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:112</note>
       </notes>
       <segment>
         <source>part.edit.tags</source>
@@ -3903,7 +3266,7 @@ Element 3</target>
     </unit>
     <unit id="4ok13kM" name="part.edit.manufacturer.label">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:127</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:123</note>
       </notes>
       <segment>
         <source>part.edit.manufacturer.label</source>
@@ -3912,7 +3275,7 @@ Element 3</target>
     </unit>
     <unit id="0qS9528" name="part.edit.manufacturer_url.label">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:134</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:130</note>
       </notes>
       <segment>
         <source>part.edit.manufacturer_url.label</source>
@@ -3921,7 +3284,7 @@ Element 3</target>
     </unit>
     <unit id="tuRAA_9" name="part.edit.mpn">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:140</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:136</note>
       </notes>
       <segment>
         <source>part.edit.mpn</source>
@@ -3930,7 +3293,7 @@ Element 3</target>
     </unit>
     <unit id="rcE_03k" name="part.edit.manufacturing_status">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:143</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:141</note>
       </notes>
       <segment>
         <source>part.edit.manufacturing_status</source>
@@ -3939,7 +3302,7 @@ Element 3</target>
     </unit>
     <unit id="tdUi2VV" name="part.edit.needs_review">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:153</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:149</note>
       </notes>
       <segment>
         <source>part.edit.needs_review</source>
@@ -3948,7 +3311,7 @@ Element 3</target>
     </unit>
     <unit id="thxZ5LH" name="part.edit.is_favorite">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:159</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:155</note>
       </notes>
       <segment>
         <source>part.edit.is_favorite</source>
@@ -3957,7 +3320,7 @@ Element 3</target>
     </unit>
     <unit id="epWuzE5" name="part.edit.mass">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:164</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:161</note>
       </notes>
       <segment>
         <source>part.edit.mass</source>
@@ -3966,7 +3329,7 @@ Element 3</target>
     </unit>
     <unit id="kpiGJo0" name="part.edit.partUnit">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:172</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:167</note>
       </notes>
       <segment>
         <source>part.edit.partUnit</source>
@@ -3975,16 +3338,25 @@ Element 3</target>
     </unit>
     <unit id="LTZRVlq" name="part.edit.comment">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:179</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:176</note>
       </notes>
       <segment>
         <source>part.edit.comment</source>
         <target state="translated">Kommentat</target>
       </segment>
     </unit>
+    <unit id="cIVLqUs" name="part.edit.master_attachment">
+      <notes>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:209</note>
+      </notes>
+      <segment>
+        <source>part.edit.master_attachment</source>
+        <target state="translated">Vorschaubild</target>
+      </segment>
+    </unit>
     <unit id="vZwa6za" name="part.edit.save">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:233</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:232</note>
         <note priority="1">src\Form\PartType.php:91</note>
       </notes>
       <segment>
@@ -3994,7 +3366,7 @@ Element 3</target>
     </unit>
     <unit id="_GqPyC3" name="part.edit.reset">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:234</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:233</note>
         <note priority="1">src\Form\PartType.php:92</note>
       </notes>
       <segment>
@@ -4002,9 +3374,36 @@ Element 3</target>
         <target>Änderungen verwerfen</target>
       </segment>
     </unit>
+    <unit id="wN.sxj3" name="part.edit.name.placeholder">
+      <notes>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:82</note>
+      </notes>
+      <segment>
+        <source>part.edit.name.placeholder</source>
+        <target state="translated">z.B. BC547</target>
+      </segment>
+    </unit>
+    <unit id="rMHwTBI" name="part.edit.description.placeholder">
+      <notes>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:90</note>
+      </notes>
+      <segment>
+        <source>part.edit.description.placeholder</source>
+        <target state="translated">z.B.  NPN 45V 0,1A 0,5W</target>
+      </segment>
+    </unit>
+    <unit id=".V3Lfkf" name="part.editmininstock.placeholder">
+      <notes>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:94</note>
+      </notes>
+      <segment>
+        <source>part.editmininstock.placeholder</source>
+        <target state="translated">e.g. 1</target>
+      </segment>
+    </unit>
     <unit id="6QS4K7r" name="part_lot.edit.description">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:52</note>
+        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:49</note>
       </notes>
       <segment>
         <source>part_lot.edit.description</source>
@@ -4013,7 +3412,7 @@ Element 3</target>
     </unit>
     <unit id="IwPHYB0" name="part_lot.edit.location">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:59</note>
+        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:56</note>
       </notes>
       <segment>
         <source>part_lot.edit.location</source>
@@ -4022,7 +3421,7 @@ Element 3</target>
     </unit>
     <unit id="VEybZz7" name="part_lot.edit.amount">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:67</note>
+        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:63</note>
       </notes>
       <segment>
         <source>part_lot.edit.amount</source>
@@ -4031,7 +3430,7 @@ Element 3</target>
     </unit>
     <unit id="OPwK3Lq" name="part_lot.edit.instock_unknown">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:72</note>
+        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:69</note>
       </notes>
       <segment>
         <source>part_lot.edit.instock_unknown</source>
@@ -4040,7 +3439,7 @@ Element 3</target>
     </unit>
     <unit id="uHBgsns" name="part_lot.edit.needs_refill">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:78</note>
+        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:75</note>
       </notes>
       <segment>
         <source>part_lot.edit.needs_refill</source>
@@ -4049,7 +3448,7 @@ Element 3</target>
     </unit>
     <unit id="xorQnlc" name="part_lot.edit.expiration_date">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:84</note>
+        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:81</note>
       </notes>
       <segment>
         <source>part_lot.edit.expiration_date</source>
@@ -4058,51 +3457,20 @@ Element 3</target>
     </unit>
     <unit id="OjwY78X" name="part_lot.edit.comment">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:89</note>
+        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:86</note>
       </notes>
       <segment>
         <source>part_lot.edit.comment</source>
         <target state="translated">Kommentar</target>
       </segment>
     </unit>
-    <unit id="Qkmb2rF" name="min_discount_quantity">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Part\PricedetailType.php:38</note>
-        <note category="state" priority="1">new</note>
-      </notes>
-      <segment>
-        <source>min_discount_quantity</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="pOOpLdD" name="price_related_quantity">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Part\PricedetailType.php:42</note>
-        <note category="state" priority="1">new</note>
-      </notes>
-      <segment>
-        <source>price_related_quantity</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="aDtTH0H" name="price">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Part\PricedetailType.php:46</note>
-        <note category="state" priority="1">new</note>
-      </notes>
-      <segment>
-        <source>price</source>
-        <target></target>
-      </segment>
-    </unit>
     <unit id="Rm5bnNV" name="currency">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PricedetailType.php:51</note>
-        <note category="state" priority="1">new</note>
+        <note category="file-source" priority="1">src\Form\Part\PricedetailType.php:54</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>currency</source>
-        <target></target>
+        <target>Währung</target>
       </segment>
     </unit>
     <unit id=".8YTKod" name="perm.group.other">
@@ -4117,140 +3485,48 @@ Element 3</target>
     <unit id="CPJxiHz" name="M">
       <notes>
         <note category="file-source" priority="1">src\Form\Type\SIUnitType.php:115</note>
-        <note category="state" priority="1">new</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>M</source>
-        <target></target>
+        <target>M</target>
       </segment>
     </unit>
     <unit id="glTDKak" name="k">
       <notes>
         <note category="file-source" priority="1">src\Form\Type\SIUnitType.php:115</note>
-        <note category="state" priority="1">new</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>k</source>
-        <target></target>
+        <target>k</target>
       </segment>
     </unit>
     <unit id="47DEQpj" name="">
-      <segment>
-        <source></source>
-        <target></target>
+      <segment state="translated">
+        <source/>
+        <target> </target>
       </segment>
     </unit>
     <unit id="YsZqel3" name="m">
       <notes>
         <note category="file-source" priority="1">src\Form\Type\SIUnitType.php:115</note>
-        <note category="state" priority="1">new</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>m</source>
-        <target></target>
+        <target>m</target>
       </segment>
     </unit>
     <unit id="WgcvG_T" name="µ">
       <notes>
         <note category="file-source" priority="1">src\Form\Type\SIUnitType.php:115</note>
-        <note category="state" priority="1">new</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>µ</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="zUJATVK" name="value">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Type\SIUnitType.php:103</note>
-        <note category="state" priority="1">new</note>
-      </notes>
-      <segment>
-        <source>value</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="56Loshb" name="prefix">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Type\SIUnitType.php:114</note>
-        <note category="state" priority="1">new</note>
-      </notes>
-      <segment>
-        <source>prefix</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="sG3lwwH" name="user.username.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:76</note>
-      </notes>
-      <segment>
-        <source>user.username.placeholder</source>
-        <target state="translated">z.B. m.muster</target>
-      </segment>
-    </unit>
-    <unit id="birjZUl" name="user.firstName.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:90</note>
-      </notes>
-      <segment>
-        <source>user.firstName.placeholder</source>
-        <target state="translated">z.B. Max</target>
-      </segment>
-    </unit>
-    <unit id="Z9pc7NJ" name="user.lastName.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:97</note>
-      </notes>
-      <segment>
-        <source>user.lastName.placeholder</source>
-        <target state="translated">z.B. Muster</target>
-      </segment>
-    </unit>
-    <unit id="VLB.yla" name="user.email.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:105</note>
-      </notes>
-      <segment>
-        <source>user.email.placeholder</source>
-        <target state="translated">z.B. m.muster@ecorp.com</target>
-      </segment>
-    </unit>
-    <unit id="UjUjKNF" name="user.department.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:112</note>
-      </notes>
-      <segment>
-        <source>user.department.placeholder</source>
-        <target state="translated">z.B. Entwicklung</target>
-      </segment>
-    </unit>
-    <unit id="lx12TjD" name="user_settings.language.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:121</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:85</note>
-        <note priority="1">src\Form\UserSettingsType.php:45</note>
-      </notes>
-      <segment>
-        <source>user_settings.language.placeholder</source>
-        <target>Serverweite Sprache</target>
-      </segment>
-    </unit>
-    <unit id="JROUC8Y" name="user_settings.timezone.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:129</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:93</note>
-        <note priority="1">src\Form\UserSettingsType.php:48</note>
-      </notes>
-      <segment>
-        <source>user_settings.timezone.placeholder</source>
-        <target>Serverweite Zeitzone</target>
+        <target>µ</target>
       </segment>
     </unit>
     <unit id="Lq0fGXJ" name="user.timezone.label">
       <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:130</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:94</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:85</note>
         <note priority="1">src\Form\UserSettingsType.php:46</note>
       </notes>
       <segment>
@@ -4258,21 +3534,9 @@ Element 3</target>
         <target>Zeitzone</target>
       </segment>
     </unit>
-    <unit id="Dpfk52." name="user_settings.theme.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:141</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:105</note>
-        <note priority="1">src\Form\UserSettingsType.php:50</note>
-      </notes>
-      <segment>
-        <source>user_settings.theme.placeholder</source>
-        <target>Serverweites Theme</target>
-      </segment>
-    </unit>
     <unit id="HhQjrkN" name="user.theme.label">
       <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:142</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:106</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:93</note>
         <note priority="1">src\Form\UserSettingsType.php:49</note>
       </notes>
       <segment>
@@ -4282,80 +3546,16 @@ Element 3</target>
     </unit>
     <unit id="uGQ16Yq" name="user.currency.label">
       <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:147</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:111</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:104</note>
       </notes>
       <segment>
         <source>user.currency.label</source>
         <target state="translated">Bevorzugte Währung</target>
       </segment>
     </unit>
-    <unit id="C65DPNY" name="user.settings.pw_new.label">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:153</note>
-      </notes>
-      <segment>
-        <source>user.settings.pw_new.label</source>
-        <target state="translated">Neues Passwort</target>
-      </segment>
-    </unit>
-    <unit id="isiBSF3" name="user.settings.pw_confirm.label">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:154</note>
-      </notes>
-      <segment>
-        <source>user.settings.pw_confirm.label</source>
-        <target state="translated">Neues Passwort bestätigen</target>
-      </segment>
-    </unit>
-    <unit id="coDk7Mi" name="user.edit.needs_pw_change">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:168</note>
-      </notes>
-      <segment>
-        <source>user.edit.needs_pw_change</source>
-        <target state="translated">Nutzer muss Passwort ändern</target>
-      </segment>
-    </unit>
-    <unit id="aU6FQLf" name="user.edit.user_disabled">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:175</note>
-      </notes>
-      <segment>
-        <source>user.edit.user_disabled</source>
-        <target state="translated">Benutzer deaktiviert (kein Login möglich)</target>
-      </segment>
-    </unit>
-    <unit id="zPJhxi6" name="user.create">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:208</note>
-      </notes>
-      <segment>
-        <source>user.create</source>
-        <target state="translated">Benutzer anlegen</target>
-      </segment>
-    </unit>
-    <unit id="SxI0Jji" name="user.edit.save">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:208</note>
-      </notes>
-      <segment>
-        <source>user.edit.save</source>
-        <target state="translated">Speichern</target>
-      </segment>
-    </unit>
-    <unit id="oGnU8Jt" name="entity.edit.reset">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:212</note>
-      </notes>
-      <segment>
-        <source>entity.edit.reset</source>
-        <target state="translated">Änderungen verwerfen</target>
-      </segment>
-    </unit>
     <unit id="FX3KkuQ" name="save">
       <notes>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:115</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:111</note>
         <note priority="1">src\Form\UserSettingsType.php:53</note>
       </notes>
       <segment>
@@ -4365,7 +3565,7 @@ Element 3</target>
     </unit>
     <unit id="Ab4wu0o" name="reset">
       <notes>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:116</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:112</note>
         <note priority="1">src\Form\UserSettingsType.php:54</note>
       </notes>
       <segment>
@@ -4373,6 +3573,36 @@ Element 3</target>
         <target>Änderungen verwerfen</target>
       </segment>
     </unit>
+    <unit id="lx12TjD" name="user_settings.language.placeholder">
+      <notes>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:81</note>
+        <note priority="1">src\Form\UserSettingsType.php:45</note>
+      </notes>
+      <segment>
+        <source>user_settings.language.placeholder</source>
+        <target>Serverweite Sprache</target>
+      </segment>
+    </unit>
+    <unit id="JROUC8Y" name="user_settings.timezone.placeholder">
+      <notes>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:89</note>
+        <note priority="1">src\Form\UserSettingsType.php:48</note>
+      </notes>
+      <segment>
+        <source>user_settings.timezone.placeholder</source>
+        <target>Serverweite Zeitzone</target>
+      </segment>
+    </unit>
+    <unit id="Dpfk52." name="user_settings.theme.placeholder">
+      <notes>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:101</note>
+        <note priority="1">src\Form\UserSettingsType.php:50</note>
+      </notes>
+      <segment>
+        <source>user_settings.theme.placeholder</source>
+        <target>Serverweites Theme</target>
+      </segment>
+    </unit>
     <unit id="ExjMUEE" name="attachment.label">
       <notes>
         <note category="file-source" priority="1">src\Services\ElementTypeNameGenerator.php:56</note>
@@ -4660,6 +3890,631 @@ Element 3</target>
         <target>Neues Element</target>
       </segment>
     </unit>
+    <unit id="dxkuAbb" name="attachment_type.edit.filetype_filter">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>attachment_type.edit.filetype_filter</source>
+        <target state="translated">Erlaubte Dateitypen</target>
+      </segment>
+    </unit>
+    <unit id="1KMaa2P" name="attachment_type.edit.filetype_filter.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>attachment_type.edit.filetype_filter.help</source>
+        <target state="translated">Sie können hier eine kommaseparierte Liste von Dateiendungen oder Mimetypen angeben, die eine hochgeladene Datei mit diesem Anhangstyp haben muss. Um alle unterstützten Bilddateien zu erlauben, kann image/* benutzt werden.</target>
+      </segment>
+    </unit>
+    <unit id="wkNc9Pm" name="attachment_type.edit.filetype_filter.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>attachment_type.edit.filetype_filter.placeholder</source>
+        <target state="translated">z.B. .txt, application/pdf, image/*</target>
+      </segment>
+    </unit>
+    <unit id="nEC2Xzw" name="part.name.placeholder">
+      <notes>
+        <note priority="1">src\Form\PartType.php:63</note>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>part.name.placeholder</source>
+        <target>z.B. BC547</target>
+      </segment>
+    </unit>
+    <unit id="SDbrzIT" name="entity.edit.not_selectable">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>entity.edit.not_selectable</source>
+        <target state="translated">Nicht auswählbar</target>
+      </segment>
+    </unit>
+    <unit id="5aUSkZz" name="entity.edit.not_selectable.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>entity.edit.not_selectable.help</source>
+        <target state="translated">Wenn diese Option aktiviert ist, dann kann dieses Element keinem Bauteil als Eigenschaft zugewiesen werden. Hilfreich z.B. wenn dieses Element nur der reinen Sortierung dienen soll.</target>
+      </segment>
+    </unit>
+    <unit id="en0DwC3" name="bbcode.hint">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>bbcode.hint</source>
+        <target state="translated">Hier kann BBCode verwendet werden (z.B. [b]Fett[/b])</target>
+      </segment>
+    </unit>
+    <unit id="Q5hCjzL" name="entity.create">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>entity.create</source>
+        <target state="translated">Element anlegen</target>
+      </segment>
+    </unit>
+    <unit id="bBoYWyf" name="entity.edit.save">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>entity.edit.save</source>
+        <target state="translated">Speichern</target>
+      </segment>
+    </unit>
+    <unit id="HeL2lAW" name="category.edit.disable_footprints">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.disable_footprints</source>
+        <target state="translated">Deaktiviere Footprints</target>
+      </segment>
+    </unit>
+    <unit id="lpS1zKs" name="category.edit.disable_footprints.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.disable_footprints.help</source>
+        <target state="translated">Wenn diese Option aktiviert ist, ist die Footprint Eigenschaft für alle Bauteile in dieser Kategorie, deaktiviert.</target>
+      </segment>
+    </unit>
+    <unit id="1w_nFL7" name="category.edit.disable_manufacturers">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.disable_manufacturers</source>
+        <target state="translated">Deaktiviere Hersteller</target>
+      </segment>
+    </unit>
+    <unit id="tNK6Sfl" name="category.edit.disable_manufacturers.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.disable_manufacturers.help</source>
+        <target state="translated">Wenn diese Option aktiviert ist, ist die Hersteller Eigenschaft für alle Bauteile in dieser Kategorie, deaktiviert.</target>
+      </segment>
+    </unit>
+    <unit id="HOZICfA" name="category.edit.disable_autodatasheets">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.disable_autodatasheets</source>
+        <target state="translated">Deaktiviere Automatische Datenblatt links</target>
+      </segment>
+    </unit>
+    <unit id="5HWLQAL" name="category.edit.disable_autodatasheets.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.disable_autodatasheets.help</source>
+        <target state="translated">Wenn diese Option aktiviert ist, werden für Bauteile mit dieser Kategorie keine automatischen Datenblattlinks erzeugt.</target>
+      </segment>
+    </unit>
+    <unit id="lfFBz4D" name="category.edit.disable_properties">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.disable_properties</source>
+        <target state="translated">Deaktiviere Eigenschaften</target>
+      </segment>
+    </unit>
+    <unit id="gu7SqNR" name="category.edit.disable_properties.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.disable_properties.help</source>
+        <target state="translated">Wenn diese Option aktiviert ist, sind die Bauteileeigenschaften für alle Bauteile in dieser Kategorie, deaktiviert.</target>
+      </segment>
+    </unit>
+    <unit id="0FP6XeT" name="category.edit.partname_hint">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.partname_hint</source>
+        <target state="translated">Namenshinweis</target>
+      </segment>
+    </unit>
+    <unit id="BG4G_f9" name="category.edit.partname_hint.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.partname_hint.placeholder</source>
+        <target state="translated">z.B. 100nF</target>
+      </segment>
+    </unit>
+    <unit id="LbTbeDm" name="category.edit.partname_regex">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.partname_regex</source>
+        <target state="translated">Namensfilter</target>
+      </segment>
+    </unit>
+    <unit id="UH78POJ" name="category.edit.default_description">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.default_description</source>
+        <target state="translated">Standard Beschreibung</target>
+      </segment>
+    </unit>
+    <unit id="8hlqVRs" name="category.edit.default_description.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.default_description.placeholder</source>
+        <target state="translated">z.B. Kondensator, 10mmx10mm, SMD</target>
+      </segment>
+    </unit>
+    <unit id="QMPrbSY" name="category.edit.default_comment">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.default_comment</source>
+        <target state="translated">Standard Kommentar</target>
+      </segment>
+    </unit>
+    <unit id="KN33Vgx" name="company.edit.address">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.address</source>
+        <target state="translated">Anschrift</target>
+      </segment>
+    </unit>
+    <unit id="AMjZLA3" name="company.edit.address.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.address.placeholder</source>
+        <target state="translated">Musterstraße 314
+31415 Beispielhausen</target>
+      </segment>
+    </unit>
+    <unit id="WoyE_3B" name="company.edit.phone_number">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.phone_number</source>
+        <target state="translated">Telefonnummer</target>
+      </segment>
+    </unit>
+    <unit id="VSMS9Jw" name="company.edit.phone_number.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.phone_number.placeholder</source>
+        <target state="translated">+49 12345 6789</target>
+      </segment>
+    </unit>
+    <unit id="khUB2so" name="company.edit.fax_number">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.fax_number</source>
+        <target state="translated">Faxnummer</target>
+      </segment>
+    </unit>
+    <unit id="63TXMfg" name="company.edit.email">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.email</source>
+        <target state="translated">Email Addresse</target>
+      </segment>
+    </unit>
+    <unit id="vTq5HxO" name="company.edit.email.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.email.placeholder</source>
+        <target state="translated">contact@foo.bar</target>
+      </segment>
+    </unit>
+    <unit id="jv3fl1U" name="company.edit.website">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.website</source>
+        <target state="translated">Website</target>
+      </segment>
+    </unit>
+    <unit id="fCwuIQc" name="company.edit.website.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.website.placeholder</source>
+        <target state="translated">https://www.foo.bar</target>
+      </segment>
+    </unit>
+    <unit id="l4BUu.S" name="company.edit.auto_product_url">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.auto_product_url</source>
+        <target state="translated">Produkt URL</target>
+      </segment>
+    </unit>
+    <unit id="UaJhZGe" name="company.edit.auto_product_url.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.auto_product_url.help</source>
+        <target state="translated">Wenn diese URL gesetzt ist, wird sie benutzt um die URL eines Bauteils auf der Website des Herstellers zu erzeugen. Dabei wird %PARTNR% mit der Bestellnummer ersetzt.</target>
+      </segment>
+    </unit>
+    <unit id="22S3ulf" name="company.edit.auto_product_url.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.auto_product_url.placeholder</source>
+        <target state="translated">https://foo.bar/product/%PARTNR%</target>
+      </segment>
+    </unit>
+    <unit id="NZUfSAR" name="currency.edit.iso_code">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>currency.edit.iso_code</source>
+        <target state="translated">ISO Code</target>
+      </segment>
+    </unit>
+    <unit id="9YIkqmF" name="currency.edit.exchange_rate">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>currency.edit.exchange_rate</source>
+        <target state="translated">Wechselkurs</target>
+      </segment>
+    </unit>
+    <unit id="n496LjY" name="footprint.edit.3d_model">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>footprint.edit.3d_model</source>
+        <target state="translated">3D Modell</target>
+      </segment>
+    </unit>
+    <unit id="bxMaU3Y" name="mass_creation.lines">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>mass_creation.lines</source>
+        <target state="translated">Eingabe</target>
+      </segment>
+    </unit>
+    <unit id="nIwyuSG" name="mass_creation.lines.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>mass_creation.lines.placeholder</source>
+        <target state="translated">Element 1
+Element 2
+Element 3</target>
+      </segment>
+    </unit>
+    <unit id="yOi8.bI" name="entity.mass_creation.btn">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>entity.mass_creation.btn</source>
+        <target state="translated">Anlegen</target>
+      </segment>
+    </unit>
+    <unit id="oqwo_n5" name="measurement_unit.edit.is_integer">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>measurement_unit.edit.is_integer</source>
+        <target state="translated">Ganzzahlig</target>
+      </segment>
+    </unit>
+    <unit id="ks8LoMb" name="measurement_unit.edit.is_integer.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>measurement_unit.edit.is_integer.help</source>
+        <target state="translated">Wenn diese Option aktiviert ist, werden alle Mengen in dieser Einheit auf ganze Zahlen gerundet.</target>
+      </segment>
+    </unit>
+    <unit id=".TAAW6t" name="measurement_unit.edit.use_si_prefix">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>measurement_unit.edit.use_si_prefix</source>
+        <target state="translated">Benutze SI Prefixe</target>
+      </segment>
+    </unit>
+    <unit id="EZh.nn7" name="measurement_unit.edit.use_si_prefix.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>measurement_unit.edit.use_si_prefix.help</source>
+        <target state="translated">Wenn diese Option aktiviert ist, werden bei Ausgabe der Zahlen SI Prefixe benutzt (z.B. 1,2kg anstatt 1200g)</target>
+      </segment>
+    </unit>
+    <unit id="zha3lRe" name="measurement_unit.edit.unit_symbol">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>measurement_unit.edit.unit_symbol</source>
+        <target state="translated">Einheitensymbol</target>
+      </segment>
+    </unit>
+    <unit id="AxSvu9V" name="measurement_unit.edit.unit_symbol.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>measurement_unit.edit.unit_symbol.placeholder</source>
+        <target state="translated">z.B. m</target>
+      </segment>
+    </unit>
+    <unit id="L68lNgx" name="storelocation.edit.is_full.label">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>storelocation.edit.is_full.label</source>
+        <target state="translated">Lagerort voll</target>
+      </segment>
+    </unit>
+    <unit id="dsw_ivP" name="storelocation.edit.is_full.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>storelocation.edit.is_full.help</source>
+        <target state="translated">Wenn diese Option aktiviert ist, ist es weder möglich neue Bauteile zu diesem Lagerort hinzuzufügen, noch die Anzahl bereits vorhandener Bauteile zu erhöhen.</target>
+      </segment>
+    </unit>
+    <unit id="jenFqgq" name="storelocation.limit_to_existing.label">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>storelocation.limit_to_existing.label</source>
+        <target state="translated">Nur bestehende Bauteile</target>
+      </segment>
+    </unit>
+    <unit id="ftawtbm" name="storelocation.limit_to_existing.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>storelocation.limit_to_existing.help</source>
+        <target state="translated">Wenn diese Option aktiv ist, ist es nicht möglich neue Bauteile zu diesem Lagerort hinzuzufügen, es ist aber möglich die Anzahl bereits vorhandener Bauteile zu erhöhen.</target>
+      </segment>
+    </unit>
+    <unit id="1DWk7ny" name="storelocation.only_single_part.label">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>storelocation.only_single_part.label</source>
+        <target state="translated">Nur ein ein Bauteil</target>
+      </segment>
+    </unit>
+    <unit id="np0unjZ" name="storelocation.only_single_part.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>storelocation.only_single_part.help</source>
+        <target state="translated">Wenn diese Option aktiviert ist, kann dieser Lagerort nur ein einzelnes Bauteil aber in beliebiger Menge fassen. Hilfreich für kleine SMD Fächer oder Feeder.</target>
+      </segment>
+    </unit>
+    <unit id="AE1UiRe" name="storelocation.storage_type.label">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>storelocation.storage_type.label</source>
+        <target state="translated">Lagertyp</target>
+      </segment>
+    </unit>
+    <unit id="3UBRYaM" name="storelocation.storage_type.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>storelocation.storage_type.help</source>
+        <target state="translated">Hier kann eine Maßeinheit gewählt werden, die ein Bauteil haben muss, damit es in diesem Lagerort gelagert werden kann.</target>
+      </segment>
+    </unit>
+    <unit id="xBJM0.O" name="supplier.edit.default_currency">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>supplier.edit.default_currency</source>
+        <target state="translated">Standardwährung</target>
+      </segment>
+    </unit>
+    <unit id="9o2s0eF" name="supplier.shipping_costs.label">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>supplier.shipping_costs.label</source>
+        <target state="translated">Versandkosten</target>
+      </segment>
+    </unit>
+    <unit id="sG3lwwH" name="user.username.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.username.placeholder</source>
+        <target state="translated">z.B. m.muster</target>
+      </segment>
+    </unit>
+    <unit id="birjZUl" name="user.firstName.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.firstName.placeholder</source>
+        <target state="translated">z.B. Max</target>
+      </segment>
+    </unit>
+    <unit id="Z9pc7NJ" name="user.lastName.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.lastName.placeholder</source>
+        <target state="translated">z.B. Muster</target>
+      </segment>
+    </unit>
+    <unit id="VLB.yla" name="user.email.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.email.placeholder</source>
+        <target state="translated">z.B. m.muster@ecorp.com</target>
+      </segment>
+    </unit>
+    <unit id="UjUjKNF" name="user.department.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.department.placeholder</source>
+        <target state="translated">z.B. Entwicklung</target>
+      </segment>
+    </unit>
+    <unit id="C65DPNY" name="user.settings.pw_new.label">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.settings.pw_new.label</source>
+        <target state="translated">Neues Passwort</target>
+      </segment>
+    </unit>
+    <unit id="isiBSF3" name="user.settings.pw_confirm.label">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.settings.pw_confirm.label</source>
+        <target state="translated">Neues Passwort bestätigen</target>
+      </segment>
+    </unit>
+    <unit id="coDk7Mi" name="user.edit.needs_pw_change">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.edit.needs_pw_change</source>
+        <target state="translated">Nutzer muss Passwort ändern</target>
+      </segment>
+    </unit>
+    <unit id="aU6FQLf" name="user.edit.user_disabled">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.edit.user_disabled</source>
+        <target state="translated">Benutzer deaktiviert (kein Login möglich)</target>
+      </segment>
+    </unit>
+    <unit id="zPJhxi6" name="user.create">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.create</source>
+        <target state="translated">Benutzer anlegen</target>
+      </segment>
+    </unit>
+    <unit id="SxI0Jji" name="user.edit.save">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.edit.save</source>
+        <target state="translated">Speichern</target>
+      </segment>
+    </unit>
+    <unit id="oGnU8Jt" name="entity.edit.reset">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>entity.edit.reset</source>
+        <target state="translated">Änderungen verwerfen</target>
+      </segment>
+    </unit>
     <unit id="eG9UnaY" name="part.withdraw.caption:">
       <notes>
         <note priority="1">templates\Parts\show_part_info.html.twig:161</note>
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index 4e06412c..067877db 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -471,7 +471,7 @@ Subelements will be moved upwards.]]></target>
     <unit id="4_pqNGT" name="export.format">
       <notes>
         <note category="file-source" priority="1">templates\AdminPages\_export_form.html.twig:4</note>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:60</note>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:56</note>
         <note priority="1">templates\AdminPages\_export_form.html.twig:4</note>
         <note priority="1">src\Form\ImportType.php:67</note>
       </notes>
@@ -1167,7 +1167,6 @@ Subelements will be moved upwards.]]></target>
       <notes>
         <note category="file-source" priority="1">templates\Parts\info\show_part_info.html.twig:46</note>
         <note category="file-source" priority="1">templates\_navbar.html.twig:46</note>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:84</note>
         <note priority="1">templates\base.html.twig:62</note>
         <note priority="1">templates\Parts\show_part_info.html.twig:74</note>
         <note priority="1">src\Form\PartType.php:86</note>
@@ -1906,8 +1905,7 @@ Subelements will be moved upwards.]]></target>
     <unit id="PwI64fM" name="user.firstName.label">
       <notes>
         <note category="file-source" priority="1">templates\Users\user_info.html.twig:18</note>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:89</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:63</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:57</note>
         <note priority="1">templates\Users\user_info.html.twig:18</note>
         <note priority="1">src\Form\UserSettingsType.php:32</note>
       </notes>
@@ -1919,8 +1917,7 @@ Subelements will be moved upwards.]]></target>
     <unit id="u2ayBIA" name="user.lastName.label">
       <notes>
         <note category="file-source" priority="1">templates\Users\user_info.html.twig:24</note>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:96</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:68</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:62</note>
         <note priority="1">templates\Users\user_info.html.twig:24</note>
         <note priority="1">src\Form\UserSettingsType.php:35</note>
       </notes>
@@ -1932,8 +1929,7 @@ Subelements will be moved upwards.]]></target>
     <unit id="cDu6Rok" name="user.email.label">
       <notes>
         <note category="file-source" priority="1">templates\Users\user_info.html.twig:30</note>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:104</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:78</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:72</note>
         <note priority="1">templates\Users\user_info.html.twig:30</note>
         <note priority="1">src\Form\UserSettingsType.php:41</note>
       </notes>
@@ -1945,8 +1941,7 @@ Subelements will be moved upwards.]]></target>
     <unit id="8GGUFm1" name="user.department.label">
       <notes>
         <note category="file-source" priority="1">templates\Users\user_info.html.twig:37</note>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:111</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:73</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:67</note>
         <note priority="1">templates\Users\user_info.html.twig:37</note>
         <note priority="1">src\Form\UserSettingsType.php:38</note>
       </notes>
@@ -1958,8 +1953,7 @@ Subelements will be moved upwards.]]></target>
     <unit id="oX4P2rM" name="user.username.label">
       <notes>
         <note category="file-source" priority="1">templates\Users\user_info.html.twig:47</note>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:75</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:58</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:53</note>
         <note priority="1">templates\Users\user_info.html.twig:47</note>
         <note priority="1">src\Form\UserSettingsType.php:30</note>
       </notes>
@@ -1971,7 +1965,6 @@ Subelements will be moved upwards.]]></target>
     <unit id="QK5x4IY" name="group.label">
       <notes>
         <note category="file-source" priority="1">templates\Users\user_info.html.twig:53</note>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:83</note>
         <note category="file-source" priority="1">src\Services\ElementTypeNameGenerator.php:70</note>
         <note priority="1">templates\Users\user_info.html.twig:53</note>
       </notes>
@@ -2056,7 +2049,6 @@ Subelements will be moved upwards.]]></target>
     <unit id="kTRK6H_" name="name.label">
       <notes>
         <note category="file-source" priority="1">templates\_navbar.html.twig:30</note>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:69</note>
         <note priority="1">templates\base.html.twig:54</note>
         <note priority="1">src\Form\PartType.php:62</note>
       </notes>
@@ -2181,8 +2173,7 @@ Subelements will be moved upwards.]]></target>
     <unit id="oabvQfM" name="user.language_select">
       <notes>
         <note category="file-source" priority="1">templates\_navbar.html.twig:115</note>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:122</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:86</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:77</note>
         <note priority="1">templates\base.html.twig:106</note>
         <note priority="1">src\Form\UserSettingsType.php:44</note>
       </notes>
@@ -2289,36 +2280,36 @@ Subelements will be moved upwards.]]></target>
       <notes>
         <note category="file-source" priority="1">src\Controller\AdminPages\BaseAdminController.php:110</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>entity.edit_flash</source>
-        <target></target>
+        <target>Changes saved successful.</target>
       </segment>
     </unit>
     <unit id="AoZHore" name="entity.edit_flash.invalid">
       <notes>
         <note category="file-source" priority="1">src\Controller\AdminPages\BaseAdminController.php:116</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>entity.edit_flash.invalid</source>
-        <target></target>
+        <target>Can not save changed. Please check your input!</target>
       </segment>
     </unit>
     <unit id="8MJvWmd" name="entity.created_flash">
       <notes>
         <note category="file-source" priority="1">src\Controller\AdminPages\BaseAdminController.php:166</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>entity.created_flash</source>
-        <target></target>
+        <target>Element created.</target>
       </segment>
     </unit>
     <unit id="zZdZuYS" name="entity.created_flash.invalid">
       <notes>
         <note category="file-source" priority="1">src\Controller\AdminPages\BaseAdminController.php:172</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>entity.created_flash.invalid</source>
-        <target></target>
+        <target>Could not create element. Please check your input!</target>
       </segment>
     </unit>
     <unit id="lSfR7sD" name="attachment_type.deleted">
@@ -2335,69 +2326,9 @@ Subelements will be moved upwards.]]></target>
       <notes>
         <note category="file-source" priority="1">src\Controller\AdminPages\BaseAdminController.php:257</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>csfr_invalid</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="6IyG_kn" name="Success Flash Message!">
-      <notes>
-        <note category="file-source" priority="1">src\Controller\DebugController.php:38</note>
-        <note priority="1">src\Controller\DebugController.php:45</note>
-      </notes>
-      <segment>
-        <source>Success Flash Message!</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="Efur0Zp" name="Error Flash Message!">
-      <notes>
-        <note category="file-source" priority="1">src\Controller\DebugController.php:39</note>
-        <note priority="1">src\Controller\DebugController.php:46</note>
-      </notes>
-      <segment>
-        <source>Error Flash Message!</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="BRCmXY4" name="Warning Flash Message!">
-      <notes>
-        <note category="file-source" priority="1">src\Controller\DebugController.php:40</note>
-        <note priority="1">src\Controller\DebugController.php:47</note>
-      </notes>
-      <segment>
-        <source>Warning Flash Message!</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="Upm6RvH" name="Notice Flash Message!">
-      <notes>
-        <note category="file-source" priority="1">src\Controller\DebugController.php:41</note>
-        <note priority="1">src\Controller\DebugController.php:48</note>
-      </notes>
-      <segment>
-        <source>Notice Flash Message!</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="p1634fX" name="Info Flash Message! &lt;b&gt;Test&lt;/b&gt;">
-      <notes>
-        <note category="file-source" priority="1">src\Controller\DebugController.php:42</note>
-        <note priority="1">src\Controller\DebugController.php:49</note>
-      </notes>
-      <segment>
-        <source>Info Flash Message! &lt;b&gt;Test&lt;/b&gt;</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="UJki1El" name="Blabla. This message type should be not know to template!">
-      <notes>
-        <note category="file-source" priority="1">src\Controller\DebugController.php:44</note>
-        <note priority="1">src\Controller\DebugController.php:51</note>
-      </notes>
-      <segment>
-        <source>Blabla. This message type should be not know to template!</source>
-        <target></target>
+        <target>CSFR Token invalid. Please reload this page or contact an administrator if this message stays.</target>
       </segment>
     </unit>
     <unit id="lZvhKYu" name="validator.noneofitschild.self">
@@ -2594,9 +2525,9 @@ Subelements will be moved upwards.]]></target>
       <notes>
         <note category="file-source" priority="1">src\Controller\PartController.php:133</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>part.deleted</source>
-        <target></target>
+        <target>Part deleted successful.</target>
       </segment>
     </unit>
     <unit id="tG.Jfwp" name="part.created_flash">
@@ -2706,7 +2637,7 @@ Subelements will be moved upwards.]]></target>
     <unit id="3ZnUiT_" name="attachment.edit.name">
       <notes>
         <note category="file-source" priority="1">src\DataTables\AttachmentDataTable.php:89</note>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:62</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:59</note>
       </notes>
       <segment>
         <source>attachment.edit.name</source>
@@ -2754,7 +2685,7 @@ Subelements will be moved upwards.]]></target>
     <unit id="xUV7Oz9" name="attachment.edit.show_in_table">
       <notes>
         <note category="file-source" priority="1">src\DataTables\AttachmentDataTable.php:169</note>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:72</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:69</note>
       </notes>
       <segment>
         <source>attachment.edit.show_in_table</source>
@@ -2937,7 +2868,7 @@ Subelements will be moved upwards.]]></target>
       <notes>
         <note category="file-source" priority="1">src\DataTables\PartsDataTable.php:272</note>
         <note category="file-source" priority="1">src\DataTables\PartsDataTable.php:274</note>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:70</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:68</note>
       </notes>
       <segment>
         <source>m_status.unknown</source>
@@ -2947,7 +2878,7 @@ Subelements will be moved upwards.]]></target>
     <unit id="BEnlUff" name="m_status.announced">
       <notes>
         <note category="file-source" priority="1">src\DataTables\PartsDataTable.php:275</note>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:71</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:68</note>
       </notes>
       <segment>
         <source>m_status.announced</source>
@@ -2957,7 +2888,7 @@ Subelements will be moved upwards.]]></target>
     <unit id="TN5xR7J" name="m_status.active">
       <notes>
         <note category="file-source" priority="1">src\DataTables\PartsDataTable.php:276</note>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:72</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:68</note>
       </notes>
       <segment>
         <source>m_status.active</source>
@@ -2967,7 +2898,7 @@ Subelements will be moved upwards.]]></target>
     <unit id="0McKh_8" name="m_status.nrfnd">
       <notes>
         <note category="file-source" priority="1">src\DataTables\PartsDataTable.php:277</note>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:73</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:68</note>
       </notes>
       <segment>
         <source>m_status.nrfnd</source>
@@ -2977,7 +2908,7 @@ Subelements will be moved upwards.]]></target>
     <unit id="L7yLwn0" name="m_status.eol">
       <notes>
         <note category="file-source" priority="1">src\DataTables\PartsDataTable.php:278</note>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:74</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:68</note>
       </notes>
       <segment>
         <source>m_status.eol</source>
@@ -2987,7 +2918,7 @@ Subelements will be moved upwards.]]></target>
     <unit id="5jxVP1H" name="m_status.discontinued">
       <notes>
         <note category="file-source" priority="1">src\DataTables\PartsDataTable.php:279</note>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:75</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:68</note>
       </notes>
       <segment>
         <source>m_status.discontinued</source>
@@ -3039,236 +2970,6 @@ Subelements will be moved upwards.]]></target>
         <target state="translated">Login successful</target>
       </segment>
     </unit>
-    <unit id="dxkuAbb" name="attachment_type.edit.filetype_filter">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\AttachmentTypeAdminForm.php:48</note>
-      </notes>
-      <segment>
-        <source>attachment_type.edit.filetype_filter</source>
-        <target state="translated">Allowed file extensions.</target>
-      </segment>
-    </unit>
-    <unit id="1KMaa2P" name="attachment_type.edit.filetype_filter.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\AttachmentTypeAdminForm.php:49</note>
-      </notes>
-      <segment>
-        <source>attachment_type.edit.filetype_filter.help</source>
-        <target state="translated">You can specify a comma separated list of file extension or mimetypes, which an uploaded file must have when assigned to this attachment type. To allow all supported image files you can use image/*.</target>
-      </segment>
-    </unit>
-    <unit id="wkNc9Pm" name="attachment_type.edit.filetype_filter.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\AttachmentTypeAdminForm.php:50</note>
-      </notes>
-      <segment>
-        <source>attachment_type.edit.filetype_filter.placeholder</source>
-        <target state="translated">e.g. .txt, application/pdf, image/*</target>
-      </segment>
-    </unit>
-    <unit id="nEC2Xzw" name="part.name.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:70</note>
-        <note priority="1">src\Form\PartType.php:63</note>
-      </notes>
-      <segment>
-        <source>part.name.placeholder</source>
-        <target>e.g. BC547</target>
-      </segment>
-    </unit>
-    <unit id="dmNi.3b" name="parent.label">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:74</note>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:70</note>
-        <note category="file-source" priority="1">src\Form\AdminPages\MassCreationForm.php:66</note>
-        <note priority="1">src\Form\ImportType.php:72</note>
-      </notes>
-      <segment>
-        <source>parent.label</source>
-        <target>Parent element</target>
-      </segment>
-    </unit>
-    <unit id="SDbrzIT" name="entity.edit.not_selectable">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:78</note>
-      </notes>
-      <segment>
-        <source>entity.edit.not_selectable</source>
-        <target state="translated">Not selectable</target>
-      </segment>
-    </unit>
-    <unit id="5aUSkZz" name="entity.edit.not_selectable.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:79</note>
-      </notes>
-      <segment>
-        <source>entity.edit.not_selectable.help</source>
-        <target state="translated">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="en0DwC3" name="bbcode.hint">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:85</note>
-      </notes>
-      <segment>
-        <source>bbcode.hint</source>
-        <target state="translated">You can use BBCode here (e.g. [b]Bold[/b])</target>
-      </segment>
-    </unit>
-    <unit id="cIVLqUs" name="part.edit.master_attachment">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:106</note>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:213</note>
-      </notes>
-      <segment>
-        <source>part.edit.master_attachment</source>
-        <target state="translated">Preview image</target>
-      </segment>
-    </unit>
-    <unit id="Q5hCjzL" name="entity.create">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:112</note>
-      </notes>
-      <segment>
-        <source>entity.create</source>
-        <target state="translated">Create element</target>
-      </segment>
-    </unit>
-    <unit id="bBoYWyf" name="entity.edit.save">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\BaseEntityAdminForm.php:112</note>
-      </notes>
-      <segment>
-        <source>entity.edit.save</source>
-        <target state="translated">Save </target>
-      </segment>
-    </unit>
-    <unit id="HeL2lAW" name="category.edit.disable_footprints">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:36</note>
-      </notes>
-      <segment>
-        <source>category.edit.disable_footprints</source>
-        <target state="translated">Disable footprints</target>
-      </segment>
-    </unit>
-    <unit id="lpS1zKs" name="category.edit.disable_footprints.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:37</note>
-      </notes>
-      <segment>
-        <source>category.edit.disable_footprints.help</source>
-        <target state="translated">If this option is activated, the footprint property is disabled for all parts with this category.</target>
-      </segment>
-    </unit>
-    <unit id="1w_nFL7" name="category.edit.disable_manufacturers">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:42</note>
-      </notes>
-      <segment>
-        <source>category.edit.disable_manufacturers</source>
-        <target state="translated">Disable manufacturers</target>
-      </segment>
-    </unit>
-    <unit id="tNK6Sfl" name="category.edit.disable_manufacturers.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:43</note>
-      </notes>
-      <segment>
-        <source>category.edit.disable_manufacturers.help</source>
-        <target state="translated">If this option is activated, the manufacturer property is disabled for all parts with this category.</target>
-      </segment>
-    </unit>
-    <unit id="HOZICfA" name="category.edit.disable_autodatasheets">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:48</note>
-      </notes>
-      <segment>
-        <source>category.edit.disable_autodatasheets</source>
-        <target state="translated">Disable automatic datasheet links</target>
-      </segment>
-    </unit>
-    <unit id="5HWLQAL" name="category.edit.disable_autodatasheets.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:49</note>
-      </notes>
-      <segment>
-        <source>category.edit.disable_autodatasheets.help</source>
-        <target state="translated">If this option is activated, no automatic links to datasheets are created for parts with this category.</target>
-      </segment>
-    </unit>
-    <unit id="lfFBz4D" name="category.edit.disable_properties">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:54</note>
-      </notes>
-      <segment>
-        <source>category.edit.disable_properties</source>
-        <target state="translated">Disable properties</target>
-      </segment>
-    </unit>
-    <unit id="gu7SqNR" name="category.edit.disable_properties.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:55</note>
-      </notes>
-      <segment>
-        <source>category.edit.disable_properties.help</source>
-        <target state="translated">If this option is activated, the part properties are disabled for parts with this category.</target>
-      </segment>
-    </unit>
-    <unit id="0FP6XeT" name="category.edit.partname_hint">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:60</note>
-      </notes>
-      <segment>
-        <source>category.edit.partname_hint</source>
-        <target state="translated">Part name hint</target>
-      </segment>
-    </unit>
-    <unit id="BG4G_f9" name="category.edit.partname_hint.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:61</note>
-      </notes>
-      <segment>
-        <source>category.edit.partname_hint.placeholder</source>
-        <target state="translated">e.g. 100nF</target>
-      </segment>
-    </unit>
-    <unit id="LbTbeDm" name="category.edit.partname_regex">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:65</note>
-      </notes>
-      <segment>
-        <source>category.edit.partname_regex</source>
-        <target state="translated">Name filter</target>
-      </segment>
-    </unit>
-    <unit id="UH78POJ" name="category.edit.default_description">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:70</note>
-      </notes>
-      <segment>
-        <source>category.edit.default_description</source>
-        <target state="translated">Default description</target>
-      </segment>
-    </unit>
-    <unit id="8hlqVRs" name="category.edit.default_description.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:71</note>
-      </notes>
-      <segment>
-        <source>category.edit.default_description.placeholder</source>
-        <target state="translated">e.g. Capacitor, 10mm x 10mm, SMD</target>
-      </segment>
-    </unit>
-    <unit id="QMPrbSY" name="category.edit.default_comment">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:75</note>
-      </notes>
-      <segment>
-        <source>category.edit.default_comment</source>
-        <target state="translated">Default comment</target>
-      </segment>
-    </unit>
     <unit id="ths2hVl" name="category.edit.default_comment.placeholder">
       <notes>
         <note category="file-source" priority="1">src\Form\AdminPages\CategoryAdminForm.php:76</note>
@@ -3278,194 +2979,9 @@ Subelements will be moved upwards.]]></target>
         <target state="translated">e.g. useful for switching</target>
       </segment>
     </unit>
-    <unit id="KN33Vgx" name="company.edit.address">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:38</note>
-      </notes>
-      <segment>
-        <source>company.edit.address</source>
-        <target state="translated">Address</target>
-      </segment>
-    </unit>
-    <unit id="AMjZLA3" name="company.edit.address.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:40</note>
-      </notes>
-      <segment>
-        <source>company.edit.address.placeholder</source>
-        <target state="translated">e.g. Examplestreet 314
-Exampletown</target>
-      </segment>
-    </unit>
-    <unit id="WoyE_3B" name="company.edit.phone_number">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:45</note>
-      </notes>
-      <segment>
-        <source>company.edit.phone_number</source>
-        <target state="translated">Phone number</target>
-      </segment>
-    </unit>
-    <unit id="VSMS9Jw" name="company.edit.phone_number.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:47</note>
-      </notes>
-      <segment>
-        <source>company.edit.phone_number.placeholder</source>
-        <target state="translated">+49 12345 6789</target>
-      </segment>
-    </unit>
-    <unit id="khUB2so" name="company.edit.fax_number">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:53</note>
-      </notes>
-      <segment>
-        <source>company.edit.fax_number</source>
-        <target state="translated">Fax number</target>
-      </segment>
-    </unit>
-    <unit id="63TXMfg" name="company.edit.email">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:60</note>
-      </notes>
-      <segment>
-        <source>company.edit.email</source>
-        <target state="translated">Email</target>
-      </segment>
-    </unit>
-    <unit id="vTq5HxO" name="company.edit.email.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:62</note>
-      </notes>
-      <segment>
-        <source>company.edit.email.placeholder</source>
-        <target state="translated">e.g. contact@foo.bar</target>
-      </segment>
-    </unit>
-    <unit id="jv3fl1U" name="company.edit.website">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:67</note>
-      </notes>
-      <segment>
-        <source>company.edit.website</source>
-        <target state="translated">Website</target>
-      </segment>
-    </unit>
-    <unit id="fCwuIQc" name="company.edit.website.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:69</note>
-      </notes>
-      <segment>
-        <source>company.edit.website.placeholder</source>
-        <target state="translated">https://www.foo.bar</target>
-      </segment>
-    </unit>
-    <unit id="l4BUu.S" name="company.edit.auto_product_url">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:74</note>
-      </notes>
-      <segment>
-        <source>company.edit.auto_product_url</source>
-        <target state="translated">Product url</target>
-      </segment>
-    </unit>
-    <unit id="UaJhZGe" name="company.edit.auto_product_url.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:75</note>
-      </notes>
-      <segment>
-        <source>company.edit.auto_product_url.help</source>
-        <target state="translated">This field is used to determine an link to the part on the company page. %PARTNR% will be replaced with the order number.</target>
-      </segment>
-    </unit>
-    <unit id="22S3ulf" name="company.edit.auto_product_url.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CompanyForm.php:77</note>
-      </notes>
-      <segment>
-        <source>company.edit.auto_product_url.placeholder</source>
-        <target state="translated">https://foo.bar/product/%PARTNR%</target>
-      </segment>
-    </unit>
-    <unit id="NZUfSAR" name="currency.edit.iso_code">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CurrencyAdminForm.php:37</note>
-      </notes>
-      <segment>
-        <source>currency.edit.iso_code</source>
-        <target state="translated">ISO code</target>
-      </segment>
-    </unit>
-    <unit id="9YIkqmF" name="currency.edit.exchange_rate">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\CurrencyAdminForm.php:44</note>
-      </notes>
-      <segment>
-        <source>currency.edit.exchange_rate</source>
-        <target state="translated">Exchange rate</target>
-      </segment>
-    </unit>
-    <unit id="n496LjY" name="footprint.edit.3d_model">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\FootprintAdminForm.php:35</note>
-      </notes>
-      <segment>
-        <source>footprint.edit.3d_model</source>
-        <target state="translated">3D model</target>
-      </segment>
-    </unit>
-    <unit id="Peaf8Qu" name="import.csv_separator">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:63</note>
-        <note priority="1">src\Form\ImportType.php:70</note>
-      </notes>
-      <segment>
-        <source>import.csv_separator</source>
-        <target>CSV separator</target>
-      </segment>
-    </unit>
-    <unit id="VteZCnR" name="import.file">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:76</note>
-        <note priority="1">src\Form\ImportType.php:75</note>
-      </notes>
-      <segment>
-        <source>import.file</source>
-        <target>File</target>
-      </segment>
-    </unit>
-    <unit id="0ybwwKw" name="import.preserve_children">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:82</note>
-        <note priority="1">src\Form\ImportType.php:78</note>
-      </notes>
-      <segment>
-        <source>import.preserve_children</source>
-        <target>Preserve child elements on import</target>
-      </segment>
-    </unit>
-    <unit id="yyIAudL" name="import.abort_on_validation">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:85</note>
-        <note priority="1">src\Form\ImportType.php:80</note>
-      </notes>
-      <segment>
-        <source>import.abort_on_validation</source>
-        <target>Abort on invalid data</target>
-      </segment>
-    </unit>
-    <unit id="_JM6Jxg" name="import.abort_on_validation.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:86</note>
-      </notes>
-      <segment>
-        <source>import.abort_on_validation.help</source>
-        <target state="translated">When this option is activated, the whole import process is aborted if invalid data is detected. If not selected, the invalid data is ignored and the importer will try to import the other elements.</target>
-      </segment>
-    </unit>
     <unit id="2xohoLw" name="JSON">
       <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:59</note>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:57</note>
         <note priority="1">src\Form\ImportType.php:68</note>
       </notes>
       <segment>
@@ -3475,7 +2991,7 @@ Exampletown</target>
     </unit>
     <unit id="QGWOmvj" name="XML">
       <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:59</note>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:57</note>
         <note priority="1">src\Form\ImportType.php:68</note>
       </notes>
       <segment>
@@ -3485,7 +3001,7 @@ Exampletown</target>
     </unit>
     <unit id="62tC9Ux" name="CSV">
       <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:59</note>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:57</note>
         <note priority="1">src\Form\ImportType.php:68</note>
       </notes>
       <segment>
@@ -3495,7 +3011,7 @@ Exampletown</target>
     </unit>
     <unit id="m26KvkJ" name="YAML">
       <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:59</note>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:57</note>
         <note priority="1">src\Form\ImportType.php:68</note>
       </notes>
       <segment>
@@ -3503,9 +3019,68 @@ Exampletown</target>
         <target>YAML</target>
       </segment>
     </unit>
+    <unit id="_JM6Jxg" name="import.abort_on_validation.help">
+      <notes>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:84</note>
+      </notes>
+      <segment>
+        <source>import.abort_on_validation.help</source>
+        <target state="translated">When this option is activated, the whole import process is aborted if invalid data is detected. If not selected, the invalid data is ignored and the importer will try to import the other elements.</target>
+      </segment>
+    </unit>
+    <unit id="Peaf8Qu" name="import.csv_separator">
+      <notes>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:60</note>
+        <note priority="1">src\Form\ImportType.php:70</note>
+      </notes>
+      <segment>
+        <source>import.csv_separator</source>
+        <target>CSV separator</target>
+      </segment>
+    </unit>
+    <unit id="dmNi.3b" name="parent.label">
+      <notes>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:65</note>
+        <note priority="1">src\Form\ImportType.php:72</note>
+      </notes>
+      <segment>
+        <source>parent.label</source>
+        <target>Parent element</target>
+      </segment>
+    </unit>
+    <unit id="VteZCnR" name="import.file">
+      <notes>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:73</note>
+        <note priority="1">src\Form\ImportType.php:75</note>
+      </notes>
+      <segment>
+        <source>import.file</source>
+        <target>File</target>
+      </segment>
+    </unit>
+    <unit id="0ybwwKw" name="import.preserve_children">
+      <notes>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:79</note>
+        <note priority="1">src\Form\ImportType.php:78</note>
+      </notes>
+      <segment>
+        <source>import.preserve_children</source>
+        <target>Preserve child elements on import</target>
+      </segment>
+    </unit>
+    <unit id="yyIAudL" name="import.abort_on_validation">
+      <notes>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:82</note>
+        <note priority="1">src\Form\ImportType.php:80</note>
+      </notes>
+      <segment>
+        <source>import.abort_on_validation</source>
+        <target>Abort on invalid data</target>
+      </segment>
+    </unit>
     <unit id="d0GsgCW" name="import.btn">
       <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:90</note>
+        <note category="file-source" priority="1">src\Form\AdminPages\ImportType.php:88</note>
         <note priority="1">src\Form\ImportType.php:85</note>
       </notes>
       <segment>
@@ -3513,182 +3088,27 @@ Exampletown</target>
         <target>Import</target>
       </segment>
     </unit>
-    <unit id="bxMaU3Y" name="mass_creation.lines">
+    <unit id="_z1YTpv" name="attachment.edit.secure_file.help">
       <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MassCreationForm.php:55</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:78</note>
       </notes>
       <segment>
-        <source>mass_creation.lines</source>
-        <target state="translated">Input</target>
+        <source>attachment.edit.secure_file.help</source>
+        <target state="translated">An attachment marked private can only accessed by authenticated users with the proper permission. If this is activated no thumbnails are generated and access to file is less perfomant.</target>
       </segment>
     </unit>
-    <unit id="nIwyuSG" name="mass_creation.lines.placeholder">
+    <unit id="pCsSiaz" name="attachment.edit.url.help">
       <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MassCreationForm.php:58</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:89</note>
       </notes>
       <segment>
-        <source>mass_creation.lines.placeholder</source>
-        <target state="translated">Element 1
-Element 2
-Element 3</target>
-      </segment>
-    </unit>
-    <unit id="yOi8.bI" name="entity.mass_creation.btn">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MassCreationForm.php:72</note>
-      </notes>
-      <segment>
-        <source>entity.mass_creation.btn</source>
-        <target state="translated">Create</target>
-      </segment>
-    </unit>
-    <unit id="oqwo_n5" name="measurement_unit.edit.is_integer">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MeasurementUnitAdminForm.php:36</note>
-      </notes>
-      <segment>
-        <source>measurement_unit.edit.is_integer</source>
-        <target state="translated">Is integer</target>
-      </segment>
-    </unit>
-    <unit id="ks8LoMb" name="measurement_unit.edit.is_integer.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MeasurementUnitAdminForm.php:37</note>
-      </notes>
-      <segment>
-        <source>measurement_unit.edit.is_integer.help</source>
-        <target state="translated">If this option is activated, all values with this unit will be rounded to whole numbers.</target>
-      </segment>
-    </unit>
-    <unit id=".TAAW6t" name="measurement_unit.edit.use_si_prefix">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MeasurementUnitAdminForm.php:42</note>
-      </notes>
-      <segment>
-        <source>measurement_unit.edit.use_si_prefix</source>
-        <target state="translated">Use SI prefix</target>
-      </segment>
-    </unit>
-    <unit id="EZh.nn7" name="measurement_unit.edit.use_si_prefix.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MeasurementUnitAdminForm.php:43</note>
-      </notes>
-      <segment>
-        <source>measurement_unit.edit.use_si_prefix.help</source>
-        <target state="translated">If this option is activated, values are outputted with SI prefixes (e.g. 1,2kg instead of 1200g)</target>
-      </segment>
-    </unit>
-    <unit id="zha3lRe" name="measurement_unit.edit.unit_symbol">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MeasurementUnitAdminForm.php:48</note>
-      </notes>
-      <segment>
-        <source>measurement_unit.edit.unit_symbol</source>
-        <target state="translated">Unit symbol</target>
-      </segment>
-    </unit>
-    <unit id="AxSvu9V" name="measurement_unit.edit.unit_symbol.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\MeasurementUnitAdminForm.php:49</note>
-      </notes>
-      <segment>
-        <source>measurement_unit.edit.unit_symbol.placeholder</source>
-        <target state="translated">e.g. m</target>
-      </segment>
-    </unit>
-    <unit id="L68lNgx" name="storelocation.edit.is_full.label">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\StorelocationAdminForm.php:38</note>
-      </notes>
-      <segment>
-        <source>storelocation.edit.is_full.label</source>
-        <target state="translated">Storelocation full</target>
-      </segment>
-    </unit>
-    <unit id="dsw_ivP" name="storelocation.edit.is_full.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\StorelocationAdminForm.php:39</note>
-      </notes>
-      <segment>
-        <source>storelocation.edit.is_full.help</source>
-        <target state="translated">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>
-      </segment>
-    </unit>
-    <unit id="jenFqgq" name="storelocation.limit_to_existing.label">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\StorelocationAdminForm.php:45</note>
-      </notes>
-      <segment>
-        <source>storelocation.limit_to_existing.label</source>
-        <target state="translated">Limit to existing parts</target>
-      </segment>
-    </unit>
-    <unit id="ftawtbm" name="storelocation.limit_to_existing.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\StorelocationAdminForm.php:46</note>
-      </notes>
-      <segment>
-        <source>storelocation.limit_to_existing.help</source>
-        <target state="translated">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>
-      </segment>
-    </unit>
-    <unit id="1DWk7ny" name="storelocation.only_single_part.label">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\StorelocationAdminForm.php:52</note>
-      </notes>
-      <segment>
-        <source>storelocation.only_single_part.label</source>
-        <target state="translated">Only single part</target>
-      </segment>
-    </unit>
-    <unit id="np0unjZ" name="storelocation.only_single_part.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\StorelocationAdminForm.php:53</note>
-      </notes>
-      <segment>
-        <source>storelocation.only_single_part.help</source>
-        <target state="translated">If this option is activated, only a single part (with every amount) can be assigned to this store location. Useful for small SMD boxes or feeders.</target>
-      </segment>
-    </unit>
-    <unit id="AE1UiRe" name="storelocation.storage_type.label">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\StorelocationAdminForm.php:59</note>
-      </notes>
-      <segment>
-        <source>storelocation.storage_type.label</source>
-        <target state="translated">Storage type</target>
-      </segment>
-    </unit>
-    <unit id="3UBRYaM" name="storelocation.storage_type.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\StorelocationAdminForm.php:60</note>
-      </notes>
-      <segment>
-        <source>storelocation.storage_type.help</source>
-        <target state="translated">You can select a measurement unit here, which a part must have to be able to be assigned to this storage loaction</target>
-      </segment>
-    </unit>
-    <unit id="xBJM0.O" name="supplier.edit.default_currency">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\SupplierForm.php:41</note>
-      </notes>
-      <segment>
-        <source>supplier.edit.default_currency</source>
-        <target state="translated">Default currency</target>
-      </segment>
-    </unit>
-    <unit id="9o2s0eF" name="supplier.shipping_costs.label">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AdminPages\SupplierForm.php:49</note>
-      </notes>
-      <segment>
-        <source>supplier.shipping_costs.label</source>
-        <target state="translated">Shipping Costs</target>
+        <source>attachment.edit.url.help</source>
+        <target state="translated">You can specify a url to an external file here, or input an keyword which is used to search in builtin ressources (e.g. footprints)</target>
       </segment>
     </unit>
     <unit id="kAlm7LR" name="attachment.edit.attachment_type">
       <notes>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:65</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:62</note>
       </notes>
       <segment>
         <source>attachment.edit.attachment_type</source>
@@ -3697,43 +3117,25 @@ Element 3</target>
     </unit>
     <unit id="v6FVutS" name="attachment.edit.secure_file">
       <notes>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:77</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:74</note>
       </notes>
       <segment>
         <source>attachment.edit.secure_file</source>
         <target state="translated">Private attachment</target>
       </segment>
     </unit>
-    <unit id="_z1YTpv" name="attachment.edit.secure_file.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:80</note>
-      </notes>
-      <segment>
-        <source>attachment.edit.secure_file.help</source>
-        <target state="translated">An attachment marked private can only accessed by authenticated users with the proper permission. If this is activated no thumbnails are generated and access to file is less perfomant.</target>
-      </segment>
-    </unit>
     <unit id="TRy0RSZ" name="attachment.edit.url">
       <notes>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:84</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:81</note>
       </notes>
       <segment>
         <source>attachment.edit.url</source>
         <target state="translated">URL</target>
       </segment>
     </unit>
-    <unit id="pCsSiaz" name="attachment.edit.url.help">
-      <notes>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:91</note>
-      </notes>
-      <segment>
-        <source>attachment.edit.url.help</source>
-        <target state="translated">You can specify a url to an external file here, or input an keyword which is used to search in builtin ressources (e.g. footprints)</target>
-      </segment>
-    </unit>
     <unit id="ZZjrGgS" name="attachment.edit.download_url">
       <notes>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:98</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:95</note>
       </notes>
       <segment>
         <source>attachment.edit.download_url</source>
@@ -3742,7 +3144,7 @@ Element 3</target>
     </unit>
     <unit id="Pew.kQr" name="attachment.edit.file">
       <notes>
-        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:105</note>
+        <note category="file-source" priority="1">src\Form\AttachmentFormType.php:102</note>
       </notes>
       <segment>
         <source>attachment.edit.file</source>
@@ -3751,25 +3153,16 @@ Element 3</target>
     </unit>
     <unit id="jv6wCpP" name="orderdetails.edit.supplierpartnr">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:58</note>
+        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:55</note>
       </notes>
       <segment>
         <source>orderdetails.edit.supplierpartnr</source>
         <target state="translated">Order number</target>
       </segment>
     </unit>
-    <unit id="7r_nI9R" name="orderdetails.edit.supplierpartnr.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:59</note>
-      </notes>
-      <segment>
-        <source>orderdetails.edit.supplierpartnr.placeholder</source>
-        <target state="translated">e.g. BC 547</target>
-      </segment>
-    </unit>
     <unit id="CimWRtu" name="orderdetails.edit.supplier">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:66</note>
+        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:62</note>
       </notes>
       <segment>
         <source>orderdetails.edit.supplier</source>
@@ -3778,7 +3171,7 @@ Element 3</target>
     </unit>
     <unit id="qfScBBj" name="orderdetails.edit.url">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:72</note>
+        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:67</note>
       </notes>
       <segment>
         <source>orderdetails.edit.url</source>
@@ -3787,61 +3180,43 @@ Element 3</target>
     </unit>
     <unit id="D_288lV" name="orderdetails.edit.obsolete">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:78</note>
+        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:73</note>
       </notes>
       <segment>
         <source>orderdetails.edit.obsolete</source>
         <target state="translated">No longer available</target>
       </segment>
     </unit>
+    <unit id="7r_nI9R" name="orderdetails.edit.supplierpartnr.placeholder">
+      <notes>
+        <note category="file-source" priority="1">src\Form\Part\OrderdetailType.php:57</note>
+      </notes>
+      <segment>
+        <source>orderdetails.edit.supplierpartnr.placeholder</source>
+        <target state="translated">e.g. BC 547</target>
+      </segment>
+    </unit>
     <unit id="HZwLFnu" name="part.edit.name">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:82</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:79</note>
       </notes>
       <segment>
         <source>part.edit.name</source>
         <target state="translated">Name</target>
       </segment>
     </unit>
-    <unit id="wN.sxj3" name="part.edit.name.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:83</note>
-      </notes>
-      <segment>
-        <source>part.edit.name.placeholder</source>
-        <target state="translated">e.g. BC547</target>
-      </segment>
-    </unit>
     <unit id="9MhdLlK" name="part.edit.description">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:89</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:85</note>
       </notes>
       <segment>
         <source>part.edit.description</source>
         <target state="translated">Description</target>
       </segment>
     </unit>
-    <unit id="rMHwTBI" name="part.edit.description.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:91</note>
-      </notes>
-      <segment>
-        <source>part.edit.description.placeholder</source>
-        <target state="translated">e.g. NPN 45V, 0,1A, 0,5W</target>
-      </segment>
-    </unit>
-    <unit id=".V3Lfkf" name="part.editmininstock.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:95</note>
-      </notes>
-      <segment>
-        <source>part.editmininstock.placeholder</source>
-        <target state="translated">e.g. 1</target>
-      </segment>
-    </unit>
     <unit id="Xzj9BP8" name="part.edit.mininstock">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:96</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:93</note>
       </notes>
       <segment>
         <source>part.edit.mininstock</source>
@@ -3850,7 +3225,7 @@ Element 3</target>
     </unit>
     <unit id="1VN9ldj" name="part.edit.category">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:102</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:99</note>
       </notes>
       <segment>
         <source>part.edit.category</source>
@@ -3859,7 +3234,7 @@ Element 3</target>
     </unit>
     <unit id="IROdosg" name="part.edit.footprint">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:109</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:105</note>
       </notes>
       <segment>
         <source>part.edit.footprint</source>
@@ -3868,7 +3243,7 @@ Element 3</target>
     </unit>
     <unit id="KHkWjTz" name="part.edit.tags">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:115</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:112</note>
       </notes>
       <segment>
         <source>part.edit.tags</source>
@@ -3877,7 +3252,7 @@ Element 3</target>
     </unit>
     <unit id="4ok13kM" name="part.edit.manufacturer.label">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:127</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:123</note>
       </notes>
       <segment>
         <source>part.edit.manufacturer.label</source>
@@ -3886,7 +3261,7 @@ Element 3</target>
     </unit>
     <unit id="0qS9528" name="part.edit.manufacturer_url.label">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:134</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:130</note>
       </notes>
       <segment>
         <source>part.edit.manufacturer_url.label</source>
@@ -3895,7 +3270,7 @@ Element 3</target>
     </unit>
     <unit id="tuRAA_9" name="part.edit.mpn">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:140</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:136</note>
       </notes>
       <segment>
         <source>part.edit.mpn</source>
@@ -3904,7 +3279,7 @@ Element 3</target>
     </unit>
     <unit id="rcE_03k" name="part.edit.manufacturing_status">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:143</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:141</note>
       </notes>
       <segment>
         <source>part.edit.manufacturing_status</source>
@@ -3913,7 +3288,7 @@ Element 3</target>
     </unit>
     <unit id="tdUi2VV" name="part.edit.needs_review">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:153</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:149</note>
       </notes>
       <segment>
         <source>part.edit.needs_review</source>
@@ -3922,7 +3297,7 @@ Element 3</target>
     </unit>
     <unit id="thxZ5LH" name="part.edit.is_favorite">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:159</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:155</note>
       </notes>
       <segment>
         <source>part.edit.is_favorite</source>
@@ -3931,7 +3306,7 @@ Element 3</target>
     </unit>
     <unit id="epWuzE5" name="part.edit.mass">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:164</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:161</note>
       </notes>
       <segment>
         <source>part.edit.mass</source>
@@ -3940,7 +3315,7 @@ Element 3</target>
     </unit>
     <unit id="kpiGJo0" name="part.edit.partUnit">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:172</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:167</note>
       </notes>
       <segment>
         <source>part.edit.partUnit</source>
@@ -3949,16 +3324,25 @@ Element 3</target>
     </unit>
     <unit id="LTZRVlq" name="part.edit.comment">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:179</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:176</note>
       </notes>
       <segment>
         <source>part.edit.comment</source>
         <target state="translated">Comment</target>
       </segment>
     </unit>
+    <unit id="cIVLqUs" name="part.edit.master_attachment">
+      <notes>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:209</note>
+      </notes>
+      <segment>
+        <source>part.edit.master_attachment</source>
+        <target state="translated">Preview image</target>
+      </segment>
+    </unit>
     <unit id="vZwa6za" name="part.edit.save">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:233</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:232</note>
         <note priority="1">src\Form\PartType.php:91</note>
       </notes>
       <segment>
@@ -3968,7 +3352,7 @@ Element 3</target>
     </unit>
     <unit id="_GqPyC3" name="part.edit.reset">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:234</note>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:233</note>
         <note priority="1">src\Form\PartType.php:92</note>
       </notes>
       <segment>
@@ -3976,9 +3360,36 @@ Element 3</target>
         <target>Reset changes</target>
       </segment>
     </unit>
+    <unit id="wN.sxj3" name="part.edit.name.placeholder">
+      <notes>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:82</note>
+      </notes>
+      <segment>
+        <source>part.edit.name.placeholder</source>
+        <target state="translated">e.g. BC547</target>
+      </segment>
+    </unit>
+    <unit id="rMHwTBI" name="part.edit.description.placeholder">
+      <notes>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:90</note>
+      </notes>
+      <segment>
+        <source>part.edit.description.placeholder</source>
+        <target state="translated">e.g. NPN 45V, 0,1A, 0,5W</target>
+      </segment>
+    </unit>
+    <unit id=".V3Lfkf" name="part.editmininstock.placeholder">
+      <notes>
+        <note category="file-source" priority="1">src\Form\Part\PartBaseType.php:94</note>
+      </notes>
+      <segment>
+        <source>part.editmininstock.placeholder</source>
+        <target state="translated">e.g. 1</target>
+      </segment>
+    </unit>
     <unit id="6QS4K7r" name="part_lot.edit.description">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:52</note>
+        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:49</note>
       </notes>
       <segment>
         <source>part_lot.edit.description</source>
@@ -3987,7 +3398,7 @@ Element 3</target>
     </unit>
     <unit id="IwPHYB0" name="part_lot.edit.location">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:59</note>
+        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:56</note>
       </notes>
       <segment>
         <source>part_lot.edit.location</source>
@@ -3996,7 +3407,7 @@ Element 3</target>
     </unit>
     <unit id="VEybZz7" name="part_lot.edit.amount">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:67</note>
+        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:63</note>
       </notes>
       <segment>
         <source>part_lot.edit.amount</source>
@@ -4005,7 +3416,7 @@ Element 3</target>
     </unit>
     <unit id="OPwK3Lq" name="part_lot.edit.instock_unknown">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:72</note>
+        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:69</note>
       </notes>
       <segment>
         <source>part_lot.edit.instock_unknown</source>
@@ -4014,7 +3425,7 @@ Element 3</target>
     </unit>
     <unit id="uHBgsns" name="part_lot.edit.needs_refill">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:78</note>
+        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:75</note>
       </notes>
       <segment>
         <source>part_lot.edit.needs_refill</source>
@@ -4023,7 +3434,7 @@ Element 3</target>
     </unit>
     <unit id="xorQnlc" name="part_lot.edit.expiration_date">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:84</note>
+        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:81</note>
       </notes>
       <segment>
         <source>part_lot.edit.expiration_date</source>
@@ -4032,49 +3443,13 @@ Element 3</target>
     </unit>
     <unit id="OjwY78X" name="part_lot.edit.comment">
       <notes>
-        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:89</note>
+        <note category="file-source" priority="1">src\Form\Part\PartLotType.php:86</note>
       </notes>
       <segment>
         <source>part_lot.edit.comment</source>
         <target state="translated">Comment</target>
       </segment>
     </unit>
-    <unit id="Qkmb2rF" name="min_discount_quantity">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Part\PricedetailType.php:38</note>
-      </notes>
-      <segment>
-        <source>min_discount_quantity</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="pOOpLdD" name="price_related_quantity">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Part\PricedetailType.php:42</note>
-      </notes>
-      <segment>
-        <source>price_related_quantity</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="aDtTH0H" name="price">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Part\PricedetailType.php:46</note>
-      </notes>
-      <segment>
-        <source>price</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="Rm5bnNV" name="currency">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Part\PricedetailType.php:51</note>
-      </notes>
-      <segment>
-        <source>currency</source>
-        <target></target>
-      </segment>
-    </unit>
     <unit id=".8YTKod" name="perm.group.other">
       <notes>
         <note category="file-source" priority="1">src\Form\Permissions\PermissionsType.php:78</note>
@@ -4088,133 +3463,47 @@ Element 3</target>
       <notes>
         <note category="file-source" priority="1">src\Form\Type\SIUnitType.php:115</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>M</source>
-        <target></target>
+        <target>M</target>
       </segment>
     </unit>
     <unit id="glTDKak" name="k">
       <notes>
         <note category="file-source" priority="1">src\Form\Type\SIUnitType.php:115</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>k</source>
-        <target></target>
+        <target>k</target>
       </segment>
     </unit>
     <unit id="47DEQpj" name="">
-      <segment>
-        <source></source>
-        <target></target>
+      <segment state="translated">
+        <source/>
+        <target> </target>
       </segment>
     </unit>
     <unit id="YsZqel3" name="m">
       <notes>
         <note category="file-source" priority="1">src\Form\Type\SIUnitType.php:115</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>m</source>
-        <target></target>
+        <target>m</target>
       </segment>
     </unit>
     <unit id="WgcvG_T" name="µ">
       <notes>
         <note category="file-source" priority="1">src\Form\Type\SIUnitType.php:115</note>
       </notes>
-      <segment>
+      <segment state="translated">
         <source>µ</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="zUJATVK" name="value">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Type\SIUnitType.php:103</note>
-      </notes>
-      <segment>
-        <source>value</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="56Loshb" name="prefix">
-      <notes>
-        <note category="file-source" priority="1">src\Form\Type\SIUnitType.php:114</note>
-      </notes>
-      <segment>
-        <source>prefix</source>
-        <target></target>
-      </segment>
-    </unit>
-    <unit id="sG3lwwH" name="user.username.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:76</note>
-      </notes>
-      <segment>
-        <source>user.username.placeholder</source>
-        <target state="translated">e.g. j.doe</target>
-      </segment>
-    </unit>
-    <unit id="birjZUl" name="user.firstName.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:90</note>
-      </notes>
-      <segment>
-        <source>user.firstName.placeholder</source>
-        <target state="translated">e.g John</target>
-      </segment>
-    </unit>
-    <unit id="Z9pc7NJ" name="user.lastName.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:97</note>
-      </notes>
-      <segment>
-        <source>user.lastName.placeholder</source>
-        <target state="translated">e.g. Doe</target>
-      </segment>
-    </unit>
-    <unit id="VLB.yla" name="user.email.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:105</note>
-      </notes>
-      <segment>
-        <source>user.email.placeholder</source>
-        <target state="translated">j.doe@ecorp.com</target>
-      </segment>
-    </unit>
-    <unit id="UjUjKNF" name="user.department.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:112</note>
-      </notes>
-      <segment>
-        <source>user.department.placeholder</source>
-        <target state="translated">e.g. Development</target>
-      </segment>
-    </unit>
-    <unit id="lx12TjD" name="user_settings.language.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:121</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:85</note>
-        <note priority="1">src\Form\UserSettingsType.php:45</note>
-      </notes>
-      <segment>
-        <source>user_settings.language.placeholder</source>
-        <target>Serverwide language</target>
-      </segment>
-    </unit>
-    <unit id="JROUC8Y" name="user_settings.timezone.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:129</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:93</note>
-        <note priority="1">src\Form\UserSettingsType.php:48</note>
-      </notes>
-      <segment>
-        <source>user_settings.timezone.placeholder</source>
-        <target>Serverwide Timezone</target>
+        <target>µ</target>
       </segment>
     </unit>
     <unit id="Lq0fGXJ" name="user.timezone.label">
       <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:130</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:94</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:85</note>
         <note priority="1">src\Form\UserSettingsType.php:46</note>
       </notes>
       <segment>
@@ -4222,21 +3511,9 @@ Element 3</target>
         <target>Timezone</target>
       </segment>
     </unit>
-    <unit id="Dpfk52." name="user_settings.theme.placeholder">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:141</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:105</note>
-        <note priority="1">src\Form\UserSettingsType.php:50</note>
-      </notes>
-      <segment>
-        <source>user_settings.theme.placeholder</source>
-        <target>Serverwide Theme</target>
-      </segment>
-    </unit>
     <unit id="HhQjrkN" name="user.theme.label">
       <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:142</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:106</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:93</note>
         <note priority="1">src\Form\UserSettingsType.php:49</note>
       </notes>
       <segment>
@@ -4246,80 +3523,16 @@ Element 3</target>
     </unit>
     <unit id="uGQ16Yq" name="user.currency.label">
       <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:147</note>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:111</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:104</note>
       </notes>
       <segment>
         <source>user.currency.label</source>
         <target state="translated">Preferred currency</target>
       </segment>
     </unit>
-    <unit id="C65DPNY" name="user.settings.pw_new.label">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:153</note>
-      </notes>
-      <segment>
-        <source>user.settings.pw_new.label</source>
-        <target state="translated">New password</target>
-      </segment>
-    </unit>
-    <unit id="isiBSF3" name="user.settings.pw_confirm.label">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:154</note>
-      </notes>
-      <segment>
-        <source>user.settings.pw_confirm.label</source>
-        <target state="translated">Confirm new password</target>
-      </segment>
-    </unit>
-    <unit id="coDk7Mi" name="user.edit.needs_pw_change">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:168</note>
-      </notes>
-      <segment>
-        <source>user.edit.needs_pw_change</source>
-        <target state="translated">User needs to change password</target>
-      </segment>
-    </unit>
-    <unit id="aU6FQLf" name="user.edit.user_disabled">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:175</note>
-      </notes>
-      <segment>
-        <source>user.edit.user_disabled</source>
-        <target state="translated">User disbaled (no login possible)</target>
-      </segment>
-    </unit>
-    <unit id="zPJhxi6" name="user.create">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:208</note>
-      </notes>
-      <segment>
-        <source>user.create</source>
-        <target state="translated">Create user</target>
-      </segment>
-    </unit>
-    <unit id="SxI0Jji" name="user.edit.save">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:208</note>
-      </notes>
-      <segment>
-        <source>user.edit.save</source>
-        <target state="translated">Save</target>
-      </segment>
-    </unit>
-    <unit id="oGnU8Jt" name="entity.edit.reset">
-      <notes>
-        <note category="file-source" priority="1">src\Form\UserAdminForm.php:212</note>
-      </notes>
-      <segment>
-        <source>entity.edit.reset</source>
-        <target state="translated">Discard changes</target>
-      </segment>
-    </unit>
     <unit id="FX3KkuQ" name="save">
       <notes>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:115</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:111</note>
         <note priority="1">src\Form\UserSettingsType.php:53</note>
       </notes>
       <segment>
@@ -4329,7 +3542,7 @@ Element 3</target>
     </unit>
     <unit id="Ab4wu0o" name="reset">
       <notes>
-        <note category="file-source" priority="1">src\Form\UserSettingsType.php:116</note>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:112</note>
         <note priority="1">src\Form\UserSettingsType.php:54</note>
       </notes>
       <segment>
@@ -4337,6 +3550,36 @@ Element 3</target>
         <target>Discard changes</target>
       </segment>
     </unit>
+    <unit id="lx12TjD" name="user_settings.language.placeholder">
+      <notes>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:81</note>
+        <note priority="1">src\Form\UserSettingsType.php:45</note>
+      </notes>
+      <segment>
+        <source>user_settings.language.placeholder</source>
+        <target>Serverwide language</target>
+      </segment>
+    </unit>
+    <unit id="JROUC8Y" name="user_settings.timezone.placeholder">
+      <notes>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:89</note>
+        <note priority="1">src\Form\UserSettingsType.php:48</note>
+      </notes>
+      <segment>
+        <source>user_settings.timezone.placeholder</source>
+        <target>Serverwide Timezone</target>
+      </segment>
+    </unit>
+    <unit id="Dpfk52." name="user_settings.theme.placeholder">
+      <notes>
+        <note category="file-source" priority="1">src\Form\UserSettingsType.php:101</note>
+        <note priority="1">src\Form\UserSettingsType.php:50</note>
+      </notes>
+      <segment>
+        <source>user_settings.theme.placeholder</source>
+        <target>Serverwide Theme</target>
+      </segment>
+    </unit>
     <unit id="ExjMUEE" name="attachment.label">
       <notes>
         <note category="file-source" priority="1">src\Services\ElementTypeNameGenerator.php:56</note>
@@ -4616,13 +3859,629 @@ Element 3</target>
         <target>New Element</target>
       </segment>
     </unit>
-    <unit id="EdCmW4z" name="FormExtractorTest">
+    <unit id="dxkuAbb" name="attachment_type.edit.filetype_filter">
       <notes>
         <note category="state" priority="1">obsolete</note>
       </notes>
       <segment>
-        <source>FormExtractorTest</source>
-        <target></target>
+        <source>attachment_type.edit.filetype_filter</source>
+        <target state="translated">Allowed file extensions.</target>
+      </segment>
+    </unit>
+    <unit id="1KMaa2P" name="attachment_type.edit.filetype_filter.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>attachment_type.edit.filetype_filter.help</source>
+        <target state="translated">You can specify a comma separated list of file extension or mimetypes, which an uploaded file must have when assigned to this attachment type. To allow all supported image files you can use image/*.</target>
+      </segment>
+    </unit>
+    <unit id="wkNc9Pm" name="attachment_type.edit.filetype_filter.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>attachment_type.edit.filetype_filter.placeholder</source>
+        <target state="translated">e.g. .txt, application/pdf, image/*</target>
+      </segment>
+    </unit>
+    <unit id="nEC2Xzw" name="part.name.placeholder">
+      <notes>
+        <note priority="1">src\Form\PartType.php:63</note>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>part.name.placeholder</source>
+        <target>e.g. BC547</target>
+      </segment>
+    </unit>
+    <unit id="SDbrzIT" name="entity.edit.not_selectable">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>entity.edit.not_selectable</source>
+        <target state="translated">Not selectable</target>
+      </segment>
+    </unit>
+    <unit id="5aUSkZz" name="entity.edit.not_selectable.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>entity.edit.not_selectable.help</source>
+        <target state="translated">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="en0DwC3" name="bbcode.hint">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>bbcode.hint</source>
+        <target state="translated">You can use BBCode here (e.g. [b]Bold[/b])</target>
+      </segment>
+    </unit>
+    <unit id="Q5hCjzL" name="entity.create">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>entity.create</source>
+        <target state="translated">Create element</target>
+      </segment>
+    </unit>
+    <unit id="bBoYWyf" name="entity.edit.save">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>entity.edit.save</source>
+        <target state="translated">Save </target>
+      </segment>
+    </unit>
+    <unit id="HeL2lAW" name="category.edit.disable_footprints">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.disable_footprints</source>
+        <target state="translated">Disable footprints</target>
+      </segment>
+    </unit>
+    <unit id="lpS1zKs" name="category.edit.disable_footprints.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.disable_footprints.help</source>
+        <target state="translated">If this option is activated, the footprint property is disabled for all parts with this category.</target>
+      </segment>
+    </unit>
+    <unit id="1w_nFL7" name="category.edit.disable_manufacturers">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.disable_manufacturers</source>
+        <target state="translated">Disable manufacturers</target>
+      </segment>
+    </unit>
+    <unit id="tNK6Sfl" name="category.edit.disable_manufacturers.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.disable_manufacturers.help</source>
+        <target state="translated">If this option is activated, the manufacturer property is disabled for all parts with this category.</target>
+      </segment>
+    </unit>
+    <unit id="HOZICfA" name="category.edit.disable_autodatasheets">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.disable_autodatasheets</source>
+        <target state="translated">Disable automatic datasheet links</target>
+      </segment>
+    </unit>
+    <unit id="5HWLQAL" name="category.edit.disable_autodatasheets.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.disable_autodatasheets.help</source>
+        <target state="translated">If this option is activated, no automatic links to datasheets are created for parts with this category.</target>
+      </segment>
+    </unit>
+    <unit id="lfFBz4D" name="category.edit.disable_properties">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.disable_properties</source>
+        <target state="translated">Disable properties</target>
+      </segment>
+    </unit>
+    <unit id="gu7SqNR" name="category.edit.disable_properties.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.disable_properties.help</source>
+        <target state="translated">If this option is activated, the part properties are disabled for parts with this category.</target>
+      </segment>
+    </unit>
+    <unit id="0FP6XeT" name="category.edit.partname_hint">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.partname_hint</source>
+        <target state="translated">Part name hint</target>
+      </segment>
+    </unit>
+    <unit id="BG4G_f9" name="category.edit.partname_hint.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.partname_hint.placeholder</source>
+        <target state="translated">e.g. 100nF</target>
+      </segment>
+    </unit>
+    <unit id="LbTbeDm" name="category.edit.partname_regex">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.partname_regex</source>
+        <target state="translated">Name filter</target>
+      </segment>
+    </unit>
+    <unit id="UH78POJ" name="category.edit.default_description">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.default_description</source>
+        <target state="translated">Default description</target>
+      </segment>
+    </unit>
+    <unit id="8hlqVRs" name="category.edit.default_description.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.default_description.placeholder</source>
+        <target state="translated">e.g. Capacitor, 10mm x 10mm, SMD</target>
+      </segment>
+    </unit>
+    <unit id="QMPrbSY" name="category.edit.default_comment">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>category.edit.default_comment</source>
+        <target state="translated">Default comment</target>
+      </segment>
+    </unit>
+    <unit id="KN33Vgx" name="company.edit.address">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.address</source>
+        <target state="translated">Address</target>
+      </segment>
+    </unit>
+    <unit id="AMjZLA3" name="company.edit.address.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.address.placeholder</source>
+        <target state="translated">e.g. Examplestreet 314
+Exampletown</target>
+      </segment>
+    </unit>
+    <unit id="WoyE_3B" name="company.edit.phone_number">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.phone_number</source>
+        <target state="translated">Phone number</target>
+      </segment>
+    </unit>
+    <unit id="VSMS9Jw" name="company.edit.phone_number.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.phone_number.placeholder</source>
+        <target state="translated">+49 12345 6789</target>
+      </segment>
+    </unit>
+    <unit id="khUB2so" name="company.edit.fax_number">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.fax_number</source>
+        <target state="translated">Fax number</target>
+      </segment>
+    </unit>
+    <unit id="63TXMfg" name="company.edit.email">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.email</source>
+        <target state="translated">Email</target>
+      </segment>
+    </unit>
+    <unit id="vTq5HxO" name="company.edit.email.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.email.placeholder</source>
+        <target state="translated">e.g. contact@foo.bar</target>
+      </segment>
+    </unit>
+    <unit id="jv3fl1U" name="company.edit.website">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.website</source>
+        <target state="translated">Website</target>
+      </segment>
+    </unit>
+    <unit id="fCwuIQc" name="company.edit.website.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.website.placeholder</source>
+        <target state="translated">https://www.foo.bar</target>
+      </segment>
+    </unit>
+    <unit id="l4BUu.S" name="company.edit.auto_product_url">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.auto_product_url</source>
+        <target state="translated">Product url</target>
+      </segment>
+    </unit>
+    <unit id="UaJhZGe" name="company.edit.auto_product_url.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.auto_product_url.help</source>
+        <target state="translated">This field is used to determine an link to the part on the company page. %PARTNR% will be replaced with the order number.</target>
+      </segment>
+    </unit>
+    <unit id="22S3ulf" name="company.edit.auto_product_url.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>company.edit.auto_product_url.placeholder</source>
+        <target state="translated">https://foo.bar/product/%PARTNR%</target>
+      </segment>
+    </unit>
+    <unit id="NZUfSAR" name="currency.edit.iso_code">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>currency.edit.iso_code</source>
+        <target state="translated">ISO code</target>
+      </segment>
+    </unit>
+    <unit id="9YIkqmF" name="currency.edit.exchange_rate">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>currency.edit.exchange_rate</source>
+        <target state="translated">Exchange rate</target>
+      </segment>
+    </unit>
+    <unit id="n496LjY" name="footprint.edit.3d_model">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>footprint.edit.3d_model</source>
+        <target state="translated">3D model</target>
+      </segment>
+    </unit>
+    <unit id="bxMaU3Y" name="mass_creation.lines">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>mass_creation.lines</source>
+        <target state="translated">Input</target>
+      </segment>
+    </unit>
+    <unit id="nIwyuSG" name="mass_creation.lines.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>mass_creation.lines.placeholder</source>
+        <target state="translated">Element 1
+Element 2
+Element 3</target>
+      </segment>
+    </unit>
+    <unit id="yOi8.bI" name="entity.mass_creation.btn">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>entity.mass_creation.btn</source>
+        <target state="translated">Create</target>
+      </segment>
+    </unit>
+    <unit id="oqwo_n5" name="measurement_unit.edit.is_integer">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>measurement_unit.edit.is_integer</source>
+        <target state="translated">Is integer</target>
+      </segment>
+    </unit>
+    <unit id="ks8LoMb" name="measurement_unit.edit.is_integer.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>measurement_unit.edit.is_integer.help</source>
+        <target state="translated">If this option is activated, all values with this unit will be rounded to whole numbers.</target>
+      </segment>
+    </unit>
+    <unit id=".TAAW6t" name="measurement_unit.edit.use_si_prefix">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>measurement_unit.edit.use_si_prefix</source>
+        <target state="translated">Use SI prefix</target>
+      </segment>
+    </unit>
+    <unit id="EZh.nn7" name="measurement_unit.edit.use_si_prefix.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>measurement_unit.edit.use_si_prefix.help</source>
+        <target state="translated">If this option is activated, values are outputted with SI prefixes (e.g. 1,2kg instead of 1200g)</target>
+      </segment>
+    </unit>
+    <unit id="zha3lRe" name="measurement_unit.edit.unit_symbol">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>measurement_unit.edit.unit_symbol</source>
+        <target state="translated">Unit symbol</target>
+      </segment>
+    </unit>
+    <unit id="AxSvu9V" name="measurement_unit.edit.unit_symbol.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>measurement_unit.edit.unit_symbol.placeholder</source>
+        <target state="translated">e.g. m</target>
+      </segment>
+    </unit>
+    <unit id="L68lNgx" name="storelocation.edit.is_full.label">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>storelocation.edit.is_full.label</source>
+        <target state="translated">Storelocation full</target>
+      </segment>
+    </unit>
+    <unit id="dsw_ivP" name="storelocation.edit.is_full.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>storelocation.edit.is_full.help</source>
+        <target state="translated">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>
+      </segment>
+    </unit>
+    <unit id="jenFqgq" name="storelocation.limit_to_existing.label">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>storelocation.limit_to_existing.label</source>
+        <target state="translated">Limit to existing parts</target>
+      </segment>
+    </unit>
+    <unit id="ftawtbm" name="storelocation.limit_to_existing.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>storelocation.limit_to_existing.help</source>
+        <target state="translated">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>
+      </segment>
+    </unit>
+    <unit id="1DWk7ny" name="storelocation.only_single_part.label">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>storelocation.only_single_part.label</source>
+        <target state="translated">Only single part</target>
+      </segment>
+    </unit>
+    <unit id="np0unjZ" name="storelocation.only_single_part.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>storelocation.only_single_part.help</source>
+        <target state="translated">If this option is activated, only a single part (with every amount) can be assigned to this store location. Useful for small SMD boxes or feeders.</target>
+      </segment>
+    </unit>
+    <unit id="AE1UiRe" name="storelocation.storage_type.label">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>storelocation.storage_type.label</source>
+        <target state="translated">Storage type</target>
+      </segment>
+    </unit>
+    <unit id="3UBRYaM" name="storelocation.storage_type.help">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>storelocation.storage_type.help</source>
+        <target state="translated">You can select a measurement unit here, which a part must have to be able to be assigned to this storage loaction</target>
+      </segment>
+    </unit>
+    <unit id="xBJM0.O" name="supplier.edit.default_currency">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>supplier.edit.default_currency</source>
+        <target state="translated">Default currency</target>
+      </segment>
+    </unit>
+    <unit id="9o2s0eF" name="supplier.shipping_costs.label">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>supplier.shipping_costs.label</source>
+        <target state="translated">Shipping Costs</target>
+      </segment>
+    </unit>
+    <unit id="sG3lwwH" name="user.username.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.username.placeholder</source>
+        <target state="translated">e.g. j.doe</target>
+      </segment>
+    </unit>
+    <unit id="birjZUl" name="user.firstName.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.firstName.placeholder</source>
+        <target state="translated">e.g John</target>
+      </segment>
+    </unit>
+    <unit id="Z9pc7NJ" name="user.lastName.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.lastName.placeholder</source>
+        <target state="translated">e.g. Doe</target>
+      </segment>
+    </unit>
+    <unit id="VLB.yla" name="user.email.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.email.placeholder</source>
+        <target state="translated">j.doe@ecorp.com</target>
+      </segment>
+    </unit>
+    <unit id="UjUjKNF" name="user.department.placeholder">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.department.placeholder</source>
+        <target state="translated">e.g. Development</target>
+      </segment>
+    </unit>
+    <unit id="C65DPNY" name="user.settings.pw_new.label">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.settings.pw_new.label</source>
+        <target state="translated">New password</target>
+      </segment>
+    </unit>
+    <unit id="isiBSF3" name="user.settings.pw_confirm.label">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.settings.pw_confirm.label</source>
+        <target state="translated">Confirm new password</target>
+      </segment>
+    </unit>
+    <unit id="coDk7Mi" name="user.edit.needs_pw_change">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.edit.needs_pw_change</source>
+        <target state="translated">User needs to change password</target>
+      </segment>
+    </unit>
+    <unit id="aU6FQLf" name="user.edit.user_disabled">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.edit.user_disabled</source>
+        <target state="translated">User disbaled (no login possible)</target>
+      </segment>
+    </unit>
+    <unit id="zPJhxi6" name="user.create">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.create</source>
+        <target state="translated">Create user</target>
+      </segment>
+    </unit>
+    <unit id="SxI0Jji" name="user.edit.save">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>user.edit.save</source>
+        <target state="translated">Save</target>
+      </segment>
+    </unit>
+    <unit id="oGnU8Jt" name="entity.edit.reset">
+      <notes>
+        <note category="state" priority="1">obsolete</note>
+      </notes>
+      <segment>
+        <source>entity.edit.reset</source>
+        <target state="translated">Discard changes</target>
       </segment>
     </unit>
     <unit id="eG9UnaY" name="part.withdraw.caption:">
diff --git a/translations/validators.de.xlf b/translations/validators.de.xlf
index c2064889..f13e0ced 100644
--- a/translations/validators.de.xlf
+++ b/translations/validators.de.xlf
@@ -20,7 +20,6 @@
         <note category="file-source" priority="1">src\Entity\PriceInformations\Currency.php:0</note>
         <note category="file-source" priority="1">src\Entity\UserSystem\Group.php:0</note>
         <note category="file-source" priority="1">src\Entity\UserSystem\User.php:0</note>
-        <note category="state" priority="1">new</note>
       </notes>
       <segment>
         <source>part.master_attachment.must_be_picture</source>
@@ -62,7 +61,6 @@
     <unit id="isXL.ie" name="validator.user.username_already_used">
       <notes>
         <note category="file-source" priority="1">src\Entity\UserSystem\User.php:0</note>
-        <note category="state" priority="1">new</note>
       </notes>
       <segment>
         <source>validator.user.username_already_used</source>