From b6787ba43870109d9f794211059bcd19f89f5fad Mon Sep 17 00:00:00 2001
From: Denny Lubitz <lubitz@vivomedia.de>
Date: Tue, 21 May 2024 08:56:13 +0200
Subject: [PATCH 01/26] BUGFIX Workspace aware NodeCacheEntryIdentifier

---
 Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php b/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php
index 936e0c6e427..efbf48f7da2 100644
--- a/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php
+++ b/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php
@@ -32,7 +32,7 @@ private function __construct(
 
     public static function fromNode(Node $node): self
     {
-        return new self('Node_' . $node->subgraphIdentity->contentStreamId->value
+        return new self('Node_' . $node->workspaceName->value
             . '_' . $node->dimensionSpacePoint->hash
             . '_' .  $node->aggregateId->value);
     }

From c0ea2c071e0f828c87b3abddd7d6a7e56ba82dba Mon Sep 17 00:00:00 2001
From: Bastian Waidelich <b.waidelich@wwwision.de>
Date: Fri, 24 May 2024 13:20:05 +0200
Subject: [PATCH 02/26] BUGFIX: Reset projections after setup in `cr:setup`
 command

Fixes: #5008
---
 .../Classes/Command/CrCommandController.php                 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Neos.ContentRepositoryRegistry/Classes/Command/CrCommandController.php b/Neos.ContentRepositoryRegistry/Classes/Command/CrCommandController.php
index b5d98b29e8e..7696dbbd19a 100644
--- a/Neos.ContentRepositoryRegistry/Classes/Command/CrCommandController.php
+++ b/Neos.ContentRepositoryRegistry/Classes/Command/CrCommandController.php
@@ -44,6 +44,9 @@ public function setupCommand(string $contentRepository = 'default', bool $resetP
     {
         $contentRepositoryId = ContentRepositoryId::fromString($contentRepository);
 
+        $this->contentRepositoryRegistry->get($contentRepositoryId)->setUp();
+        $this->outputLine('<success>Content Repository "%s" was set up</success>', [$contentRepositoryId->value]);
+
         if ($resetProjections) {
             if (!$this->output->askConfirmation(sprintf('> Advanced Mode. The flag --reset-projections will reset all projections in "%s", which leaves you with empty projections to be replayed. Are you sure to proceed? (y/n) ', $contentRepositoryId->value), false)) {
                 $this->outputLine('<comment>Abort.</comment>');
@@ -54,9 +57,6 @@ public function setupCommand(string $contentRepository = 'default', bool $resetP
             $projectionService->resetAllProjections();
             $this->outputLine('<success>All projections of Content Repository "%s" were resettet.</success>', [$contentRepositoryId->value]);
         }
-
-        $this->contentRepositoryRegistry->get($contentRepositoryId)->setUp();
-        $this->outputLine('<success>Content Repository "%s" was set up</success>', [$contentRepositoryId->value]);
     }
 
     /**

From 5a092d0536b6420e1a5f5af0bbe5a18e1f1b25df Mon Sep 17 00:00:00 2001
From: Bastian Waidelich <b.waidelich@wwwision.de>
Date: Sat, 25 May 2024 14:12:08 +0200
Subject: [PATCH 03/26] Remove `--reset-projections` flag

---
 .../Classes/Command/CrCommandController.php        | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/Neos.ContentRepositoryRegistry/Classes/Command/CrCommandController.php b/Neos.ContentRepositoryRegistry/Classes/Command/CrCommandController.php
index 7696dbbd19a..47ab58afc2a 100644
--- a/Neos.ContentRepositoryRegistry/Classes/Command/CrCommandController.php
+++ b/Neos.ContentRepositoryRegistry/Classes/Command/CrCommandController.php
@@ -38,25 +38,13 @@ public function __construct(
      * That command will also display information what is about to be migrated.
      *
      * @param string $contentRepository Identifier of the Content Repository to set up
-     * @param bool $resetProjections Advanced. Can be used in rare cases when the projections cannot be migrated to reset everything in advance. This requires a full replay afterwards.
      */
-    public function setupCommand(string $contentRepository = 'default', bool $resetProjections = false): void
+    public function setupCommand(string $contentRepository = 'default'): void
     {
         $contentRepositoryId = ContentRepositoryId::fromString($contentRepository);
 
         $this->contentRepositoryRegistry->get($contentRepositoryId)->setUp();
         $this->outputLine('<success>Content Repository "%s" was set up</success>', [$contentRepositoryId->value]);
-
-        if ($resetProjections) {
-            if (!$this->output->askConfirmation(sprintf('> Advanced Mode. The flag --reset-projections will reset all projections in "%s", which leaves you with empty projections to be replayed. Are you sure to proceed? (y/n) ', $contentRepositoryId->value), false)) {
-                $this->outputLine('<comment>Abort.</comment>');
-                return;
-            }
-
-            $projectionService = $this->contentRepositoryRegistry->buildService($contentRepositoryId, $this->projectionServiceFactory);
-            $projectionService->resetAllProjections();
-            $this->outputLine('<success>All projections of Content Repository "%s" were resettet.</success>', [$contentRepositoryId->value]);
-        }
     }
 
     /**

From 0db90e304b93182cc89f2e46da825eb8ff6b7c5e Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Sun, 26 May 2024 09:41:26 +0200
Subject: [PATCH 04/26] TASK: Move `NodeCacheEntryIdentifier` to Fusion
 namespace

---
 .../Cache}/NodeCacheEntryIdentifier.php                |  2 +-
 Neos.Neos/Classes/Fusion/Helper/CachingHelper.php      | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)
 rename Neos.Neos/Classes/{Domain/Model => Fusion/Cache}/NodeCacheEntryIdentifier.php (96%)

diff --git a/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php b/Neos.Neos/Classes/Fusion/Cache/NodeCacheEntryIdentifier.php
similarity index 96%
rename from Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php
rename to Neos.Neos/Classes/Fusion/Cache/NodeCacheEntryIdentifier.php
index efbf48f7da2..40a9315a24f 100644
--- a/Neos.Neos/Classes/Domain/Model/NodeCacheEntryIdentifier.php
+++ b/Neos.Neos/Classes/Fusion/Cache/NodeCacheEntryIdentifier.php
@@ -12,7 +12,7 @@
 
 declare(strict_types=1);
 
-namespace Neos\Neos\Domain\Model;
+namespace Neos\Neos\Fusion\Cache;
 
 use Neos\Flow\Annotations as Flow;
 use Neos\Cache\CacheAwareInterface;
diff --git a/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php b/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php
index 5901939576b..fb64a7a175b 100644
--- a/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php
+++ b/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php
@@ -22,7 +22,7 @@
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Eel\ProtectedContextAwareInterface;
 use Neos\Flow\Annotations as Flow;
-use Neos\Neos\Domain\Model\NodeCacheEntryIdentifier;
+use Neos\Neos\Fusion\Cache\NodeCacheEntryIdentifier;
 use Neos\Neos\Fusion\Cache\CacheTag;
 use Neos\Neos\Fusion\Cache\CacheTagSet;
 
@@ -56,6 +56,14 @@ public function nodeTag(iterable|Node $nodes): array
         return CacheTagSet::forNodeAggregatesFromNodes(Nodes::fromArray($nodes))->toStringArray();
     }
 
+    /**
+     * Generate a `@cache` entry identifier for a given node:
+     *
+     *     entryIdentifier {
+     *       documentNode = ${Neos.Caching.entryIdentifierForNode(documentNode)}
+     *     }
+     *
+     */
     public function entryIdentifierForNode(Node $node): NodeCacheEntryIdentifier
     {
         return NodeCacheEntryIdentifier::fromNode($node);

From 4cbe2a40361c43db46c371cb66116fccfe52849b Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Mon, 27 May 2024 09:59:19 +0200
Subject: [PATCH 05/26] TASK: Use correct @template-covariant tag for
 ProjectionFactoryInterface

See also https://github.com/neos/neos-development-collection/commit/329330e02b6b3aec50c1c3e041306f67ce59809d

See https://phpstan.org/blog/whats-up-with-template-covariant
---
 .../Classes/Projection/ProjectionFactoryInterface.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Neos.ContentRepository.Core/Classes/Projection/ProjectionFactoryInterface.php b/Neos.ContentRepository.Core/Classes/Projection/ProjectionFactoryInterface.php
index e1609e6e6be..6c0de0992d5 100644
--- a/Neos.ContentRepository.Core/Classes/Projection/ProjectionFactoryInterface.php
+++ b/Neos.ContentRepository.Core/Classes/Projection/ProjectionFactoryInterface.php
@@ -7,7 +7,7 @@
 use Neos\ContentRepository\Core\Factory\ProjectionFactoryDependencies;
 
 /**
- * @template T of ProjectionInterface
+ * @template-covariant T of ProjectionInterface
  * @api
  */
 interface ProjectionFactoryInterface

From 596cb2fc13def5e0a84fe5ad5d59e9d1c0948778 Mon Sep 17 00:00:00 2001
From: Denny Lubitz <lubitz@vivomedia.de>
Date: Mon, 3 Jun 2024 22:48:17 +0200
Subject: [PATCH 06/26] BUGFIX: Flush node content caches without workspace
 name

---
 Neos.Neos/Classes/Fusion/Cache/CacheTag.php   | 45 ++++++++++++++++---
 .../Classes/Fusion/Cache/CacheTagSet.php      | 35 +++++++++++++++
 .../Fusion/Cache/ContentCacheFlusher.php      | 20 ++++++---
 .../Classes/Fusion/Helper/CachingHelper.php   | 28 ++++++++----
 4 files changed, 105 insertions(+), 23 deletions(-)

diff --git a/Neos.Neos/Classes/Fusion/Cache/CacheTag.php b/Neos.Neos/Classes/Fusion/Cache/CacheTag.php
index 69814d621ef..98b8e1dcabf 100644
--- a/Neos.Neos/Classes/Fusion/Cache/CacheTag.php
+++ b/Neos.Neos/Classes/Fusion/Cache/CacheTag.php
@@ -32,7 +32,7 @@ private function __construct(
 
     final public static function forNodeAggregate(
         ContentRepositoryId $contentRepositoryId,
-        WorkspaceName $workspaceName,
+        ?WorkspaceName $workspaceName,
         NodeAggregateId $nodeAggregateId,
     ): self {
         return new self(
@@ -51,9 +51,18 @@ final public static function forNodeAggregateFromNode(Node $node): self
         );
     }
 
+    final public static function forNodeAggregateFromNodeWithoutWorkspace(Node $node): self
+    {
+        return self::forNodeAggregate(
+            $node->contentRepositoryId,
+            null,
+            $node->aggregateId
+        );
+    }
+
     final public static function forDescendantOfNode(
         ContentRepositoryId $contentRepositoryId,
-        WorkspaceName $workspaceName,
+        ?WorkspaceName $workspaceName,
         NodeAggregateId $nodeAggregateId,
     ): self {
         return new self(
@@ -72,9 +81,18 @@ final public static function forDescendantOfNodeFromNode(Node $node): self
         );
     }
 
+    final public static function forDescendantOfNodeFromNodeWithoutWorkspace(Node $node): self
+    {
+        return self::forDescendantOfNode(
+            $node->contentRepositoryId,
+            null,
+            $node->aggregateId
+        );
+    }
+
     final public static function forAncestorNode(
         ContentRepositoryId $contentRepositoryId,
-        WorkspaceName $workspaceName,
+        ?WorkspaceName $workspaceName,
         NodeAggregateId $nodeAggregateId,
     ): self {
         return new self(
@@ -93,9 +111,18 @@ final public static function forAncestorNodeFromNode(Node $node): self
         );
     }
 
+    final public static function forAncestorNodeFromNodeWithoutWorkspace(Node $node): self
+    {
+        return self::forAncestorNode(
+            $node->contentRepositoryId,
+            null,
+            $node->aggregateId
+        );
+    }
+
     final public static function forNodeTypeName(
         ContentRepositoryId $contentRepositoryId,
-        WorkspaceName $workspaceName,
+        ?WorkspaceName $workspaceName,
         NodeTypeName $nodeTypeName,
     ): self {
         return new self(
@@ -107,7 +134,7 @@ final public static function forNodeTypeName(
 
     final public static function forDynamicNodeAggregate(
         ContentRepositoryId $contentRepositoryId,
-        WorkspaceName $workspaceName,
+        ?WorkspaceName $workspaceName,
         NodeAggregateId $nodeAggregateId,
     ): self {
         return new self(
@@ -123,9 +150,13 @@ final public static function fromString(string $string): self
     }
 
     protected static function getHashForWorkspaceNameAndContentRepositoryId(
-        WorkspaceName $workspaceName,
+        ?WorkspaceName $workspaceName,
         ContentRepositoryId $contentRepositoryId,
     ): string {
-        return sha1($workspaceName->value . '@' . $contentRepositoryId->value);
+        if ($workspaceName) {
+            return sha1($workspaceName->value . '@' . $contentRepositoryId->value);
+        }
+        return sha1($contentRepositoryId->value);
+
     }
 }
diff --git a/Neos.Neos/Classes/Fusion/Cache/CacheTagSet.php b/Neos.Neos/Classes/Fusion/Cache/CacheTagSet.php
index b620b062470..e8e3ec2a603 100644
--- a/Neos.Neos/Classes/Fusion/Cache/CacheTagSet.php
+++ b/Neos.Neos/Classes/Fusion/Cache/CacheTagSet.php
@@ -45,6 +45,17 @@ public static function forDescendantOfNodesFromNodes(
         ));
     }
 
+    public static function forDescendantOfNodesFromNodesWithoutWorkspace(
+        Nodes $nodes
+    ): self {
+        return new self(...array_map(
+            fn (Node $node): CacheTag => CacheTag::forDescendantOfNodeFromNodeWithoutWorkspace(
+                $node
+            ),
+            iterator_to_array($nodes)
+        ));
+    }
+
     public static function forNodeAggregatesFromNodes(
         Nodes $nodes
     ): self {
@@ -56,6 +67,16 @@ public static function forNodeAggregatesFromNodes(
         ));
     }
 
+    public static function forNodeAggregatesFromNodesWithoutWorkspace(
+        Nodes $nodes
+    ): self {
+        return new self(...array_map(
+            fn (Node $node): CacheTag => CacheTag::forNodeAggregateFromNodeWithoutWorkspace(
+                $node
+            ),
+            iterator_to_array($nodes)
+        ));
+    }
 
     public static function forNodeTypeNames(
         ContentRepositoryId $contentRepositoryId,
@@ -72,6 +93,20 @@ public static function forNodeTypeNames(
         ));
     }
 
+    public static function forNodeTypeNamesWithoutWorkspace(
+        ContentRepositoryId $contentRepositoryId,
+        NodeTypeNames $nodeTypeNames
+    ): self {
+        return new self(...array_map(
+            fn (NodeTypeName $nodeTypeName): CacheTag => CacheTag::forNodeTypeName(
+                $contentRepositoryId,
+                null,
+                $nodeTypeName
+            ),
+            iterator_to_array($nodeTypeNames)
+        ));
+    }
+
     public function add(CacheTag $cacheTag): self
     {
         $tags = $this->tags;
diff --git a/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php b/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php
index daea26cfeec..59e5908748f 100644
--- a/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php
+++ b/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php
@@ -72,7 +72,7 @@ public function flushNodeAggregate(
         $tagsToFlush[ContentCache::TAG_EVERYTHING] = 'which were tagged with "Everything".';
 
         $tagsToFlush = array_merge(
-            $this->collectTagsForChangeOnNodeAggregate($contentRepository, $workspaceName, $nodeAggregateId),
+            $this->collectTagsForChangeOnNodeAggregate($contentRepository, $workspaceName, $nodeAggregateId, $workspaceName),
             $tagsToFlush
         );
 
@@ -80,12 +80,17 @@ public function flushNodeAggregate(
     }
 
     /**
+     * WorkspaceNameToFlush is nullable, so we can flush all workspaces as no specific workspaceName is provided.
+     * This is needed to flush nodes on asset changes, as the asset can get rendered in all workspaces, but lives
+     * usually only in live workspace.
+     *
      * @return array<string,string>
      */
     private function collectTagsForChangeOnNodeAggregate(
         ContentRepository $contentRepository,
         WorkspaceName $workspaceName,
-        NodeAggregateId $nodeAggregateId
+        NodeAggregateId $nodeAggregateId,
+        ?WorkspaceName $workspaceNameToFlush
     ): array {
         $contentGraph = $contentRepository->getContentGraph($workspaceName);
 
@@ -96,12 +101,12 @@ private function collectTagsForChangeOnNodeAggregate(
             // Node Aggregate was removed in the meantime, so no need to clear caches on this one anymore.
             return [];
         }
-        $tagsToFlush = $this->collectTagsForChangeOnNodeIdentifier($contentRepository->id, $workspaceName, $nodeAggregateId);
+        $tagsToFlush = $this->collectTagsForChangeOnNodeIdentifier($contentRepository->id, $workspaceNameToFlush, $nodeAggregateId);
 
         $tagsToFlush = array_merge($this->collectTagsForChangeOnNodeType(
             $nodeAggregate->nodeTypeName,
             $contentRepository->id,
-            $workspaceName,
+            $workspaceNameToFlush,
             $nodeAggregateId,
             $contentRepository
         ), $tagsToFlush);
@@ -159,7 +164,7 @@ private function collectTagsForChangeOnNodeAggregate(
      */
     private function collectTagsForChangeOnNodeIdentifier(
         ContentRepositoryId $contentRepositoryId,
-        WorkspaceName $workspaceName,
+        ?WorkspaceName $workspaceName,
         NodeAggregateId $nodeAggregateId,
     ): array {
         $tagsToFlush = [];
@@ -192,7 +197,7 @@ private function collectTagsForChangeOnNodeIdentifier(
     private function collectTagsForChangeOnNodeType(
         NodeTypeName $nodeTypeName,
         ContentRepositoryId $contentRepositoryId,
-        WorkspaceName $workspaceName,
+        ?WorkspaceName $workspaceName,
         ?NodeAggregateId $referenceNodeIdentifier,
         ContentRepository $contentRepository
     ): array {
@@ -305,7 +310,8 @@ public function registerAssetChange(AssetInterface $asset): void
                     $this->collectTagsForChangeOnNodeAggregate(
                         $contentRepository,
                         $workspaceName,
-                        $usage->nodeAggregateId
+                        $usage->nodeAggregateId,
+                        null
                     ),
                     $tagsToFlush
                 );
diff --git a/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php b/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php
index 5901939576b..c4d7485b7d0 100644
--- a/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php
+++ b/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php
@@ -53,7 +53,10 @@ public function nodeTag(iterable|Node $nodes): array
             $nodes = iterator_to_array($nodes);
         }
 
-        return CacheTagSet::forNodeAggregatesFromNodes(Nodes::fromArray($nodes))->toStringArray();
+        return array_merge(
+            CacheTagSet::forNodeAggregatesFromNodes(Nodes::fromArray($nodes))->toStringArray(),
+            CacheTagSet::forNodeAggregatesFromNodesWithoutWorkspace(Nodes::fromArray($nodes))->toStringArray(),
+        );
     }
 
     public function entryIdentifierForNode(Node $node): NodeCacheEntryIdentifier
@@ -94,11 +97,17 @@ public function nodeTypeTag(string|iterable $nodeTypes, Node $contextNode): arra
             $nodeTypes = iterator_to_array($nodeTypes);
         }
 
-        return CacheTagSet::forNodeTypeNames(
-            $contextNode->contentRepositoryId,
-            $contextNode->workspaceName,
-            NodeTypeNames::fromStringArray($nodeTypes)
-        )->toStringArray();
+        return array_merge(
+            CacheTagSet::forNodeTypeNames(
+                $contextNode->contentRepositoryId,
+                $contextNode->workspaceName,
+                NodeTypeNames::fromStringArray($nodeTypes)
+            )->toStringArray(),
+            CacheTagSet::forNodeTypeNamesWithoutWorkspace(
+                $contextNode->contentRepositoryId,
+                NodeTypeNames::fromStringArray($nodeTypes)
+            )->toStringArray(),
+        );
     }
 
     /**
@@ -118,9 +127,10 @@ public function descendantOfTag(iterable|Node $nodes): array
             $nodes = iterator_to_array($nodes);
         }
 
-        return CacheTagSet::forDescendantOfNodesFromNodes(
-            Nodes::fromArray($nodes)
-        )->toStringArray();
+        return array_merge(
+            CacheTagSet::forDescendantOfNodesFromNodes(Nodes::fromArray($nodes))->toStringArray(),
+            CacheTagSet::forDescendantOfNodesFromNodesWithoutWorkspace(Nodes::fromArray($nodes))->toStringArray(),
+        );
     }
 
     /**

From 3614a5b84ab4e42d67855733cf5cace853a44cbe Mon Sep 17 00:00:00 2001
From: Denny Lubitz <lubitz@vivomedia.de>
Date: Mon, 3 Jun 2024 22:57:05 +0200
Subject: [PATCH 07/26] BUGFIX: Flush node content caches without workspace
 name

---
 Neos.Neos/Classes/Fusion/Cache/CacheTag.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Neos.Neos/Classes/Fusion/Cache/CacheTag.php b/Neos.Neos/Classes/Fusion/Cache/CacheTag.php
index 98b8e1dcabf..b471c458ade 100644
--- a/Neos.Neos/Classes/Fusion/Cache/CacheTag.php
+++ b/Neos.Neos/Classes/Fusion/Cache/CacheTag.php
@@ -157,6 +157,5 @@ protected static function getHashForWorkspaceNameAndContentRepositoryId(
             return sha1($workspaceName->value . '@' . $contentRepositoryId->value);
         }
         return sha1($contentRepositoryId->value);
-
     }
 }

From 36e8c505a0c2626b28cc6df91cf33477fcb4cff5 Mon Sep 17 00:00:00 2001
From: Denny Lubitz <lubitz@vivomedia.de>
Date: Tue, 4 Jun 2024 00:26:17 +0200
Subject: [PATCH 08/26] BUGFIX: Flush node content caches without workspace
 name

---
 .../Unit/Fusion/Helper/CachingHelperTest.php  | 49 +++++++++++++++----
 1 file changed, 40 insertions(+), 9 deletions(-)

diff --git a/Neos.Neos/Tests/Unit/Fusion/Helper/CachingHelperTest.php b/Neos.Neos/Tests/Unit/Fusion/Helper/CachingHelperTest.php
index 2f9916b6399..3b9992926f9 100644
--- a/Neos.Neos/Tests/Unit/Fusion/Helper/CachingHelperTest.php
+++ b/Neos.Neos/Tests/Unit/Fusion/Helper/CachingHelperTest.php
@@ -57,12 +57,20 @@ public function nodeTypeTagDataProvider()
         $nodeTypeName3 = 'Neos.Neos:Moo';
 
         return [
-            [$nodeTypeName1, ['NodeType_364cfc8e70b2baa23dbd14503d2bd00e063829e7_Neos_Neos-Foo']],
+            [$nodeTypeName1,
+                [
+                    'NodeType_364cfc8e70b2baa23dbd14503d2bd00e063829e7_Neos_Neos-Foo',
+                    'NodeType_7505d64a54e061b7acd54ccd58b49dc43500b635_Neos_Neos-Foo',
+                ]
+            ],
             [[$nodeTypeName1, $nodeTypeName2, $nodeTypeName3],
                 [
                     'NodeType_364cfc8e70b2baa23dbd14503d2bd00e063829e7_Neos_Neos-Foo',
                     'NodeType_364cfc8e70b2baa23dbd14503d2bd00e063829e7_Neos_Neos-Bar',
                     'NodeType_364cfc8e70b2baa23dbd14503d2bd00e063829e7_Neos_Neos-Moo',
+                    'NodeType_7505d64a54e061b7acd54ccd58b49dc43500b635_Neos_Neos-Foo',
+                    'NodeType_7505d64a54e061b7acd54ccd58b49dc43500b635_Neos_Neos-Bar',
+                    'NodeType_7505d64a54e061b7acd54ccd58b49dc43500b635_Neos_Neos-Moo',
                 ]
             ],
             [(new \ArrayObject([$nodeTypeName1, $nodeTypeName2, $nodeTypeName3])),
@@ -70,6 +78,9 @@ public function nodeTypeTagDataProvider()
                     'NodeType_364cfc8e70b2baa23dbd14503d2bd00e063829e7_Neos_Neos-Foo',
                     'NodeType_364cfc8e70b2baa23dbd14503d2bd00e063829e7_Neos_Neos-Bar',
                     'NodeType_364cfc8e70b2baa23dbd14503d2bd00e063829e7_Neos_Neos-Moo',
+                    'NodeType_7505d64a54e061b7acd54ccd58b49dc43500b635_Neos_Neos-Foo',
+                    'NodeType_7505d64a54e061b7acd54ccd58b49dc43500b635_Neos_Neos-Bar',
+                    'NodeType_7505d64a54e061b7acd54ccd58b49dc43500b635_Neos_Neos-Moo',
                 ]
             ],
         ];
@@ -103,15 +114,25 @@ public function nodeDataProvider()
         $node2 = $this->createNode(NodeAggregateId::fromString($nodeIdentifier2));
 
         return [
-            [$node1, ['Node_364cfc8e70b2baa23dbd14503d2bd00e063829e7_ca511a55-c5c0-f7d7-8d71-8edeffc75306']],
-            [[$node1], ['Node_364cfc8e70b2baa23dbd14503d2bd00e063829e7_ca511a55-c5c0-f7d7-8d71-8edeffc75306']],
+            [$node1, [
+                'Node_364cfc8e70b2baa23dbd14503d2bd00e063829e7_ca511a55-c5c0-f7d7-8d71-8edeffc75306',
+                'Node_7505d64a54e061b7acd54ccd58b49dc43500b635_ca511a55-c5c0-f7d7-8d71-8edeffc75306',
+            ]],
+            [[$node1], [
+                'Node_364cfc8e70b2baa23dbd14503d2bd00e063829e7_ca511a55-c5c0-f7d7-8d71-8edeffc75306',
+                'Node_7505d64a54e061b7acd54ccd58b49dc43500b635_ca511a55-c5c0-f7d7-8d71-8edeffc75306',
+            ]],
             [[$node1, $node2], [
                 'Node_364cfc8e70b2baa23dbd14503d2bd00e063829e7_ca511a55-c5c0-f7d7-8d71-8edeffc75306',
-                'Node_364cfc8e70b2baa23dbd14503d2bd00e063829e7_7005c7cf-4d19-ce36-0873-476b6cadb71a'
+                'Node_364cfc8e70b2baa23dbd14503d2bd00e063829e7_7005c7cf-4d19-ce36-0873-476b6cadb71a',
+                'Node_7505d64a54e061b7acd54ccd58b49dc43500b635_ca511a55-c5c0-f7d7-8d71-8edeffc75306',
+                'Node_7505d64a54e061b7acd54ccd58b49dc43500b635_7005c7cf-4d19-ce36-0873-476b6cadb71a',
             ]],
             [(new \ArrayObject([$node1, $node2])), [
                 'Node_364cfc8e70b2baa23dbd14503d2bd00e063829e7_ca511a55-c5c0-f7d7-8d71-8edeffc75306',
-                'Node_364cfc8e70b2baa23dbd14503d2bd00e063829e7_7005c7cf-4d19-ce36-0873-476b6cadb71a'
+                'Node_364cfc8e70b2baa23dbd14503d2bd00e063829e7_7005c7cf-4d19-ce36-0873-476b6cadb71a',
+                'Node_7505d64a54e061b7acd54ccd58b49dc43500b635_ca511a55-c5c0-f7d7-8d71-8edeffc75306',
+                'Node_7505d64a54e061b7acd54ccd58b49dc43500b635_7005c7cf-4d19-ce36-0873-476b6cadb71a',
             ]]
         ];
     }
@@ -169,15 +190,25 @@ public function descendantOfDataProvider()
 
 
         return [
-            [$node1, ['DescendantOf_364cfc8e70b2baa23dbd14503d2bd00e063829e7_ca511a55-c5c0-f7d7-8d71-8edeffc75306']],
-            [[$node1], ['DescendantOf_364cfc8e70b2baa23dbd14503d2bd00e063829e7_ca511a55-c5c0-f7d7-8d71-8edeffc75306']],
+            [$node1, [
+                'DescendantOf_364cfc8e70b2baa23dbd14503d2bd00e063829e7_ca511a55-c5c0-f7d7-8d71-8edeffc75306',
+                'DescendantOf_7505d64a54e061b7acd54ccd58b49dc43500b635_ca511a55-c5c0-f7d7-8d71-8edeffc75306',
+            ]],
+            [[$node1], [
+                'DescendantOf_364cfc8e70b2baa23dbd14503d2bd00e063829e7_ca511a55-c5c0-f7d7-8d71-8edeffc75306',
+                'DescendantOf_7505d64a54e061b7acd54ccd58b49dc43500b635_ca511a55-c5c0-f7d7-8d71-8edeffc75306',
+            ]],
             [[$node1, $node2], [
                 'DescendantOf_364cfc8e70b2baa23dbd14503d2bd00e063829e7_ca511a55-c5c0-f7d7-8d71-8edeffc75306',
-                'DescendantOf_364cfc8e70b2baa23dbd14503d2bd00e063829e7_7005c7cf-4d19-ce36-0873-476b6cadb71a'
+                'DescendantOf_364cfc8e70b2baa23dbd14503d2bd00e063829e7_7005c7cf-4d19-ce36-0873-476b6cadb71a',
+                'DescendantOf_7505d64a54e061b7acd54ccd58b49dc43500b635_ca511a55-c5c0-f7d7-8d71-8edeffc75306',
+                'DescendantOf_7505d64a54e061b7acd54ccd58b49dc43500b635_7005c7cf-4d19-ce36-0873-476b6cadb71a',
             ]],
             [(new \ArrayObject([$node1, $node2])), [
                 'DescendantOf_364cfc8e70b2baa23dbd14503d2bd00e063829e7_ca511a55-c5c0-f7d7-8d71-8edeffc75306',
-                'DescendantOf_364cfc8e70b2baa23dbd14503d2bd00e063829e7_7005c7cf-4d19-ce36-0873-476b6cadb71a'
+                'DescendantOf_364cfc8e70b2baa23dbd14503d2bd00e063829e7_7005c7cf-4d19-ce36-0873-476b6cadb71a',
+                'DescendantOf_7505d64a54e061b7acd54ccd58b49dc43500b635_ca511a55-c5c0-f7d7-8d71-8edeffc75306',
+                'DescendantOf_7505d64a54e061b7acd54ccd58b49dc43500b635_7005c7cf-4d19-ce36-0873-476b6cadb71a',
             ]]
         ];
     }

From 8b8e4f4e3d60d2d5f77c100958bcab831ab94b10 Mon Sep 17 00:00:00 2001
From: Denny Lubitz <lubitz@vivomedia.de>
Date: Tue, 4 Jun 2024 10:11:38 +0200
Subject: [PATCH 09/26] BUGFIX: Flush node content caches without workspace
 name

---
 Neos.Neos/Classes/Fusion/Cache/CacheTag.php | 41 +++++++++++++++------
 1 file changed, 29 insertions(+), 12 deletions(-)

diff --git a/Neos.Neos/Classes/Fusion/Cache/CacheTag.php b/Neos.Neos/Classes/Fusion/Cache/CacheTag.php
index b471c458ade..1c0eb7867f7 100644
--- a/Neos.Neos/Classes/Fusion/Cache/CacheTag.php
+++ b/Neos.Neos/Classes/Fusion/Cache/CacheTag.php
@@ -18,6 +18,8 @@
 class CacheTag
 {
     protected const PATTERN = '/^[a-zA-Z0-9_%\-&]{1,250}$/';
+    protected const NODE_PREFIX = 'Node';
+    protected const PARTS_DELIMITER = '_';
 
     private function __construct(
         public readonly string $value
@@ -32,13 +34,28 @@ private function __construct(
 
     final public static function forNodeAggregate(
         ContentRepositoryId $contentRepositoryId,
-        ?WorkspaceName $workspaceName,
+        WorkspaceName $workspaceName,
         NodeAggregateId $nodeAggregateId,
     ): self {
         return new self(
-            'Node_'
+            self::NODE_PREFIX
+            . self::PARTS_DELIMITER
             . self::getHashForWorkspaceNameAndContentRepositoryId($workspaceName, $contentRepositoryId)
-            . '_' . $nodeAggregateId->value
+            . self::PARTS_DELIMITER
+            . $nodeAggregateId->value
+        );
+    }
+
+    final public static function forNodeAggregateWithoutWorkspaceName(
+        ContentRepositoryId $contentRepositoryId,
+        NodeAggregateId $nodeAggregateId,
+    ): self {
+        return new self(
+            self::NODE_PREFIX
+            . self::PARTS_DELIMITER
+            . self::getHashForContentRepositoryId($contentRepositoryId)
+            . self::PARTS_DELIMITER
+            . $nodeAggregateId->value
         );
     }
 
@@ -53,9 +70,8 @@ final public static function forNodeAggregateFromNode(Node $node): self
 
     final public static function forNodeAggregateFromNodeWithoutWorkspace(Node $node): self
     {
-        return self::forNodeAggregate(
+        return self::forNodeAggregateWithoutWorkspaceName(
             $node->contentRepositoryId,
-            null,
             $node->aggregateId
         );
     }
@@ -83,9 +99,8 @@ final public static function forDescendantOfNodeFromNode(Node $node): self
 
     final public static function forDescendantOfNodeFromNodeWithoutWorkspace(Node $node): self
     {
-        return self::forDescendantOfNode(
+        return self::forNodeAggregateWithoutWorkspaceName(
             $node->contentRepositoryId,
-            null,
             $node->aggregateId
         );
     }
@@ -113,9 +128,8 @@ final public static function forAncestorNodeFromNode(Node $node): self
 
     final public static function forAncestorNodeFromNodeWithoutWorkspace(Node $node): self
     {
-        return self::forAncestorNode(
+        return self::forNodeAggregateWithoutWorkspaceName(
             $node->contentRepositoryId,
-            null,
             $node->aggregateId
         );
     }
@@ -153,9 +167,12 @@ protected static function getHashForWorkspaceNameAndContentRepositoryId(
         ?WorkspaceName $workspaceName,
         ContentRepositoryId $contentRepositoryId,
     ): string {
-        if ($workspaceName) {
-            return sha1($workspaceName->value . '@' . $contentRepositoryId->value);
-        }
+        return sha1($workspaceName->value . '@' . $contentRepositoryId->value);
+    }
+
+    protected static function getHashForContentRepositoryId(
+        ContentRepositoryId $contentRepositoryId,
+    ): string {
         return sha1($contentRepositoryId->value);
     }
 }

From 2a6a8ccc81b704830efe5240205b118c1945a986 Mon Sep 17 00:00:00 2001
From: Bastian Waidelich <b.waidelich@wwwision.de>
Date: Tue, 4 Jun 2024 14:33:55 +0200
Subject: [PATCH 10/26] Adjust `CacheTag` to use special
 `CacheTagWorkspaceName::ANY` instead of `null`

---
 Neos.Neos/Classes/Fusion/Cache/CacheTag.php   | 111 ++++++------------
 .../Classes/Fusion/Cache/CacheTagSet.php      |  46 +++-----
 .../Fusion/Cache/CacheTagWorkspaceName.php    |  13 ++
 .../Fusion/Cache/ContentCacheFlusher.php      |  11 +-
 .../Classes/Fusion/Helper/CachingHelper.php   |   4 +-
 5 files changed, 76 insertions(+), 109 deletions(-)
 create mode 100644 Neos.Neos/Classes/Fusion/Cache/CacheTagWorkspaceName.php

diff --git a/Neos.Neos/Classes/Fusion/Cache/CacheTag.php b/Neos.Neos/Classes/Fusion/Cache/CacheTag.php
index 1c0eb7867f7..40510f233ba 100644
--- a/Neos.Neos/Classes/Fusion/Cache/CacheTag.php
+++ b/Neos.Neos/Classes/Fusion/Cache/CacheTag.php
@@ -18,8 +18,11 @@
 class CacheTag
 {
     protected const PATTERN = '/^[a-zA-Z0-9_%\-&]{1,250}$/';
-    protected const NODE_PREFIX = 'Node';
-    protected const PARTS_DELIMITER = '_';
+    protected const PREFIX_NODE = 'Node';
+    protected const PREFIX_DESCENDANT_OF = 'DescendantOf';
+    protected const PREFIX_ANCESTOR = 'Ancestor';
+    protected const PREFIX_NODE_TYPE = 'NodeType';
+    protected const PREFIX_DYNAMIC_NODE_TAG = 'DynamicNodeTag';
 
     private function __construct(
         public readonly string $value
@@ -32,30 +35,20 @@ private function __construct(
         }
     }
 
-    final public static function forNodeAggregate(
-        ContentRepositoryId $contentRepositoryId,
-        WorkspaceName $workspaceName,
-        NodeAggregateId $nodeAggregateId,
-    ): self {
-        return new self(
-            self::NODE_PREFIX
-            . self::PARTS_DELIMITER
-            . self::getHashForWorkspaceNameAndContentRepositoryId($workspaceName, $contentRepositoryId)
-            . self::PARTS_DELIMITER
-            . $nodeAggregateId->value
-        );
+    private static function fromSegments(string ...$segments): self
+    {
+        return new self(implode('_', $segments));
     }
 
-    final public static function forNodeAggregateWithoutWorkspaceName(
+    final public static function forNodeAggregate(
         ContentRepositoryId $contentRepositoryId,
+        WorkspaceName|CacheTagWorkspaceName $workspaceName,
         NodeAggregateId $nodeAggregateId,
     ): self {
-        return new self(
-            self::NODE_PREFIX
-            . self::PARTS_DELIMITER
-            . self::getHashForContentRepositoryId($contentRepositoryId)
-            . self::PARTS_DELIMITER
-            . $nodeAggregateId->value
+        return self::fromSegments(
+            self::PREFIX_NODE,
+            self::getHashForWorkspaceNameAndContentRepositoryId($workspaceName, $contentRepositoryId),
+            $nodeAggregateId->value,
         );
     }
 
@@ -68,23 +61,15 @@ final public static function forNodeAggregateFromNode(Node $node): self
         );
     }
 
-    final public static function forNodeAggregateFromNodeWithoutWorkspace(Node $node): self
-    {
-        return self::forNodeAggregateWithoutWorkspaceName(
-            $node->contentRepositoryId,
-            $node->aggregateId
-        );
-    }
-
     final public static function forDescendantOfNode(
         ContentRepositoryId $contentRepositoryId,
-        ?WorkspaceName $workspaceName,
+        WorkspaceName|CacheTagWorkspaceName $workspaceName,
         NodeAggregateId $nodeAggregateId,
     ): self {
-        return new self(
-            'DescendantOf_'
-            . self::getHashForWorkspaceNameAndContentRepositoryId($workspaceName, $contentRepositoryId)
-            . '_' . $nodeAggregateId->value
+        return self::fromSegments(
+            self::PREFIX_DESCENDANT_OF,
+            self::getHashForWorkspaceNameAndContentRepositoryId($workspaceName, $contentRepositoryId),
+            $nodeAggregateId->value,
         );
     }
 
@@ -97,23 +82,15 @@ final public static function forDescendantOfNodeFromNode(Node $node): self
         );
     }
 
-    final public static function forDescendantOfNodeFromNodeWithoutWorkspace(Node $node): self
-    {
-        return self::forNodeAggregateWithoutWorkspaceName(
-            $node->contentRepositoryId,
-            $node->aggregateId
-        );
-    }
-
     final public static function forAncestorNode(
         ContentRepositoryId $contentRepositoryId,
-        ?WorkspaceName $workspaceName,
+        WorkspaceName|CacheTagWorkspaceName $workspaceName,
         NodeAggregateId $nodeAggregateId,
     ): self {
-        return new self(
-            'Ancestor_'
-            . self::getHashForWorkspaceNameAndContentRepositoryId($workspaceName, $contentRepositoryId)
-            . '_' . $nodeAggregateId->value
+        return self::fromSegments(
+            self::PREFIX_ANCESTOR,
+            self::getHashForWorkspaceNameAndContentRepositoryId($workspaceName, $contentRepositoryId),
+            $nodeAggregateId->value,
         );
     }
 
@@ -126,35 +103,27 @@ final public static function forAncestorNodeFromNode(Node $node): self
         );
     }
 
-    final public static function forAncestorNodeFromNodeWithoutWorkspace(Node $node): self
-    {
-        return self::forNodeAggregateWithoutWorkspaceName(
-            $node->contentRepositoryId,
-            $node->aggregateId
-        );
-    }
-
     final public static function forNodeTypeName(
         ContentRepositoryId $contentRepositoryId,
-        ?WorkspaceName $workspaceName,
+        WorkspaceName|CacheTagWorkspaceName $workspaceName,
         NodeTypeName $nodeTypeName,
     ): self {
-        return new self(
-            'NodeType_'
-            . self::getHashForWorkspaceNameAndContentRepositoryId($workspaceName, $contentRepositoryId)
-            . '_' . \strtr($nodeTypeName->value, '.:', '_-')
+        return self::fromSegments(
+            self::PREFIX_NODE_TYPE,
+            self::getHashForWorkspaceNameAndContentRepositoryId($workspaceName, $contentRepositoryId),
+            \strtr($nodeTypeName->value, '.:', '_-'),
         );
     }
 
     final public static function forDynamicNodeAggregate(
         ContentRepositoryId $contentRepositoryId,
-        ?WorkspaceName $workspaceName,
+        WorkspaceName|CacheTagWorkspaceName $workspaceName,
         NodeAggregateId $nodeAggregateId,
     ): self {
-        return new self(
-            'DynamicNodeTag_'
-            . self::getHashForWorkspaceNameAndContentRepositoryId($workspaceName, $contentRepositoryId)
-            . '_' . $nodeAggregateId->value
+        return self::fromSegments(
+            self::PREFIX_DYNAMIC_NODE_TAG,
+            self::getHashForWorkspaceNameAndContentRepositoryId($workspaceName, $contentRepositoryId),
+            $nodeAggregateId->value,
         );
     }
 
@@ -164,15 +133,11 @@ final public static function fromString(string $string): self
     }
 
     protected static function getHashForWorkspaceNameAndContentRepositoryId(
-        ?WorkspaceName $workspaceName,
+        WorkspaceName|CacheTagWorkspaceName $workspaceName,
         ContentRepositoryId $contentRepositoryId,
     ): string {
-        return sha1($workspaceName->value . '@' . $contentRepositoryId->value);
-    }
-
-    protected static function getHashForContentRepositoryId(
-        ContentRepositoryId $contentRepositoryId,
-    ): string {
-        return sha1($contentRepositoryId->value);
+        return sha1(
+            $workspaceName === CacheTagWorkspaceName::ANY ? $contentRepositoryId->value : $workspaceName->value . '@' . $contentRepositoryId->value
+        );
     }
 }
diff --git a/Neos.Neos/Classes/Fusion/Cache/CacheTagSet.php b/Neos.Neos/Classes/Fusion/Cache/CacheTagSet.php
index e8e3ec2a603..e96bfd769cb 100644
--- a/Neos.Neos/Classes/Fusion/Cache/CacheTagSet.php
+++ b/Neos.Neos/Classes/Fusion/Cache/CacheTagSet.php
@@ -38,19 +38,19 @@ public static function forDescendantOfNodesFromNodes(
         Nodes $nodes
     ): self {
         return new self(...array_map(
-            fn (Node $node): CacheTag => CacheTag::forDescendantOfNodeFromNode(
-                $node
-            ),
-            iterator_to_array($nodes)
+            CacheTag::forDescendantOfNodeFromNode(...),
+            iterator_to_array($nodes),
         ));
     }
 
     public static function forDescendantOfNodesFromNodesWithoutWorkspace(
-        Nodes $nodes
+        Nodes $nodes,
     ): self {
         return new self(...array_map(
-            fn (Node $node): CacheTag => CacheTag::forDescendantOfNodeFromNodeWithoutWorkspace(
-                $node
+            static fn (Node $node) => CacheTag::forDescendantOfNode(
+                $node->contentRepositoryId,
+                CacheTagWorkspaceName::ANY,
+                $node->aggregateId,
             ),
             iterator_to_array($nodes)
         ));
@@ -60,9 +60,7 @@ public static function forNodeAggregatesFromNodes(
         Nodes $nodes
     ): self {
         return new self(...array_map(
-            fn (Node $node): CacheTag => CacheTag::forNodeAggregateFromNode(
-                $node
-            ),
+            CacheTag::forNodeAggregateFromNode(...),
             iterator_to_array($nodes)
         ));
     }
@@ -71,20 +69,22 @@ public static function forNodeAggregatesFromNodesWithoutWorkspace(
         Nodes $nodes
     ): self {
         return new self(...array_map(
-            fn (Node $node): CacheTag => CacheTag::forNodeAggregateFromNodeWithoutWorkspace(
-                $node
+            static fn (Node $node) => CacheTag::forNodeAggregate(
+                $node->contentRepositoryId,
+                CacheTagWorkspaceName::ANY,
+                $node->aggregateId
             ),
-            iterator_to_array($nodes)
+            iterator_to_array($nodes),
         ));
     }
 
     public static function forNodeTypeNames(
         ContentRepositoryId $contentRepositoryId,
-        WorkspaceName $workspaceName,
+        WorkspaceName|CacheTagWorkspaceName $workspaceName,
         NodeTypeNames $nodeTypeNames
     ): self {
         return new self(...array_map(
-            fn (NodeTypeName $nodeTypeName): CacheTag => CacheTag::forNodeTypeName(
+            static fn (NodeTypeName $nodeTypeName): CacheTag => CacheTag::forNodeTypeName(
                 $contentRepositoryId,
                 $workspaceName,
                 $nodeTypeName
@@ -93,20 +93,6 @@ public static function forNodeTypeNames(
         ));
     }
 
-    public static function forNodeTypeNamesWithoutWorkspace(
-        ContentRepositoryId $contentRepositoryId,
-        NodeTypeNames $nodeTypeNames
-    ): self {
-        return new self(...array_map(
-            fn (NodeTypeName $nodeTypeName): CacheTag => CacheTag::forNodeTypeName(
-                $contentRepositoryId,
-                null,
-                $nodeTypeName
-            ),
-            iterator_to_array($nodeTypeNames)
-        ));
-    }
-
     public function add(CacheTag $cacheTag): self
     {
         $tags = $this->tags;
@@ -121,7 +107,7 @@ public function add(CacheTag $cacheTag): self
     public function toStringArray(): array
     {
         return array_map(
-            fn (CacheTag $tag): string => $tag->value,
+            static fn (CacheTag $tag): string => $tag->value,
             array_values($this->tags)
         );
     }
diff --git a/Neos.Neos/Classes/Fusion/Cache/CacheTagWorkspaceName.php b/Neos.Neos/Classes/Fusion/Cache/CacheTagWorkspaceName.php
new file mode 100644
index 00000000000..2aaa79b476e
--- /dev/null
+++ b/Neos.Neos/Classes/Fusion/Cache/CacheTagWorkspaceName.php
@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Neos\Neos\Fusion\Cache;
+
+/**
+ * A special enum to explicitly represent any workspace {@see CacheTag}
+ */
+enum CacheTagWorkspaceName
+{
+    case ANY;
+}
diff --git a/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php b/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php
index 59e5908748f..19ddc3fffbf 100644
--- a/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php
+++ b/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php
@@ -72,7 +72,7 @@ public function flushNodeAggregate(
         $tagsToFlush[ContentCache::TAG_EVERYTHING] = 'which were tagged with "Everything".';
 
         $tagsToFlush = array_merge(
-            $this->collectTagsForChangeOnNodeAggregate($contentRepository, $workspaceName, $nodeAggregateId, $workspaceName),
+            $this->collectTagsForChangeOnNodeAggregate($contentRepository, $workspaceName, $nodeAggregateId, false),
             $tagsToFlush
         );
 
@@ -90,7 +90,7 @@ private function collectTagsForChangeOnNodeAggregate(
         ContentRepository $contentRepository,
         WorkspaceName $workspaceName,
         NodeAggregateId $nodeAggregateId,
-        ?WorkspaceName $workspaceNameToFlush
+        bool $anyWorkspace,
     ): array {
         $contentGraph = $contentRepository->getContentGraph($workspaceName);
 
@@ -101,6 +101,7 @@ private function collectTagsForChangeOnNodeAggregate(
             // Node Aggregate was removed in the meantime, so no need to clear caches on this one anymore.
             return [];
         }
+        $workspaceNameToFlush = $anyWorkspace ? CacheTagWorkspaceName::ANY : $workspaceName;
         $tagsToFlush = $this->collectTagsForChangeOnNodeIdentifier($contentRepository->id, $workspaceNameToFlush, $nodeAggregateId);
 
         $tagsToFlush = array_merge($this->collectTagsForChangeOnNodeType(
@@ -164,7 +165,7 @@ private function collectTagsForChangeOnNodeAggregate(
      */
     private function collectTagsForChangeOnNodeIdentifier(
         ContentRepositoryId $contentRepositoryId,
-        ?WorkspaceName $workspaceName,
+        WorkspaceName|CacheTagWorkspaceName $workspaceName,
         NodeAggregateId $nodeAggregateId,
     ): array {
         $tagsToFlush = [];
@@ -197,7 +198,7 @@ private function collectTagsForChangeOnNodeIdentifier(
     private function collectTagsForChangeOnNodeType(
         NodeTypeName $nodeTypeName,
         ContentRepositoryId $contentRepositoryId,
-        ?WorkspaceName $workspaceName,
+        WorkspaceName|CacheTagWorkspaceName $workspaceName,
         ?NodeAggregateId $referenceNodeIdentifier,
         ContentRepository $contentRepository
     ): array {
@@ -311,7 +312,7 @@ public function registerAssetChange(AssetInterface $asset): void
                         $contentRepository,
                         $workspaceName,
                         $usage->nodeAggregateId,
-                        null
+                        true
                     ),
                     $tagsToFlush
                 );
diff --git a/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php b/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php
index c4d7485b7d0..11e56aa3d26 100644
--- a/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php
+++ b/Neos.Neos/Classes/Fusion/Helper/CachingHelper.php
@@ -25,6 +25,7 @@
 use Neos\Neos\Domain\Model\NodeCacheEntryIdentifier;
 use Neos\Neos\Fusion\Cache\CacheTag;
 use Neos\Neos\Fusion\Cache\CacheTagSet;
+use Neos\Neos\Fusion\Cache\CacheTagWorkspaceName;
 
 /**
  * Caching helper to make cache tag generation easier.
@@ -103,8 +104,9 @@ public function nodeTypeTag(string|iterable $nodeTypes, Node $contextNode): arra
                 $contextNode->workspaceName,
                 NodeTypeNames::fromStringArray($nodeTypes)
             )->toStringArray(),
-            CacheTagSet::forNodeTypeNamesWithoutWorkspace(
+            CacheTagSet::forNodeTypeNames(
                 $contextNode->contentRepositoryId,
+                CacheTagWorkspaceName::ANY,
                 NodeTypeNames::fromStringArray($nodeTypes)
             )->toStringArray(),
         );

From 2b4890cb5596cab3e921bdc027b01376c4c11bb9 Mon Sep 17 00:00:00 2001
From: Denny Lubitz <lubitz@vivomedia.de>
Date: Tue, 4 Jun 2024 14:51:20 +0200
Subject: [PATCH 11/26] BUGFIX: Flush node content caches without workspace
 name

---
 Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php b/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php
index 19ddc3fffbf..992d776e12d 100644
--- a/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php
+++ b/Neos.Neos/Classes/Fusion/Cache/ContentCacheFlusher.php
@@ -80,9 +80,8 @@ public function flushNodeAggregate(
     }
 
     /**
-     * WorkspaceNameToFlush is nullable, so we can flush all workspaces as no specific workspaceName is provided.
-     * This is needed to flush nodes on asset changes, as the asset can get rendered in all workspaces, but lives
-     * usually only in live workspace.
+     * @param bool $anyWorkspace This is needed to flush nodes on asset changes, as the asset can get rendered in all workspaces, but lives
+     *                            usually only in live workspace.
      *
      * @return array<string,string>
      */

From d27a607a670fde981cfb4c216bab4fbc25e025ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anke=20H=C3=A4slich?= <anke@neos.io>
Date: Mon, 10 Jun 2024 13:14:29 +0200
Subject: [PATCH 12/26] TASK: Remove generation of site.xml in `./flow
 kickstart:site`

As the `./flow site:import` command was removed we don't need to generate a `site.xml` anymore.
---
 .../Command/KickstartCommandController.php    |  2 +-
 .../Generator/AfxTemplateGenerator.php        | 28 +----------------
 .../Private/AfxGenerator/Content/Sites.xml    | 31 -------------------
 3 files changed, 2 insertions(+), 59 deletions(-)
 delete mode 100755 Neos.SiteKickstarter/Resources/Private/AfxGenerator/Content/Sites.xml

diff --git a/Neos.SiteKickstarter/Classes/Command/KickstartCommandController.php b/Neos.SiteKickstarter/Classes/Command/KickstartCommandController.php
index a294af48583..1e9dabe5cd2 100755
--- a/Neos.SiteKickstarter/Classes/Command/KickstartCommandController.php
+++ b/Neos.SiteKickstarter/Classes/Command/KickstartCommandController.php
@@ -44,7 +44,7 @@ class KickstartCommandController extends CommandController
     /**
      * Kickstart a new site package
      *
-     * This command generates a new site package with basic Fusion and Sites.xml
+     * This command generates a new site package with basic Fusion
      *
      * @param string $packageKey The packageKey for your site
      * @param string $siteName The siteName of your site
diff --git a/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php b/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
index a9d6687f9ea..e9aa151cde5 100755
--- a/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
+++ b/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
@@ -17,9 +17,9 @@
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Package\PackageManager;
 use Neos\Kickstarter\Service\GeneratorService;
+use Neos\SiteKickstarter\Service\FusionRecursiveDirectoryRenderer;
 use Neos\SiteKickstarter\Service\SimpleTemplateRenderer;
 use Neos\Utility\Files;
-use Neos\SiteKickstarter\Service\FusionRecursiveDirectoryRenderer;
 
 /**
  * Service to generate site packages
@@ -63,7 +63,6 @@ public function generateSitePackage(string $packageKey, string $siteName) : arra
             ]
         ]);
 
-        $this->generateSitesXml($packageKey, $siteName);
         $this->generateSitesFusionDirectory($packageKey, $siteName);
         $this->generateNodeTypesConfiguration($packageKey);
         $this->generateAdditionalFolders($packageKey);
@@ -71,31 +70,6 @@ public function generateSitePackage(string $packageKey, string $siteName) : arra
         return $this->generatedFiles;
     }
 
-    /**
-     * Generate a "Sites.xml" for the given package and name.
-     *
-     * @param string $packageKey
-     * @param string $siteName
-     * @throws \Neos\Flow\Package\Exception\UnknownPackageException
-     * @throws \Neos\FluidAdaptor\Core\Exception
-     */
-    protected function generateSitesXml(string $packageKey, string $siteName) : void
-    {
-        $templatePathAndFilename = $this->getResourcePathForFile('Content/Sites.xml');
-
-        $contextVariables = [
-            'packageKey' => $packageKey,
-            'siteName' => htmlspecialchars($siteName),
-            'siteNodeName' => $this->generateSiteNodeName($packageKey),
-            'dimensions' => 'wat' //$this->contentDimensionZookeeper->getAllowedDimensionSubspace()
-        ];
-
-        $fileContent = $this->renderTemplate($templatePathAndFilename, $contextVariables);
-
-        $sitesXmlPathAndFilename = $this->packageManager->getPackage($packageKey)->getResourcesPath() . 'Private/Content/Sites.xml';
-        $this->generateFile($sitesXmlPathAndFilename, $fileContent);
-    }
-
     /**
      * Generate basic root Fusion file.
      *
diff --git a/Neos.SiteKickstarter/Resources/Private/AfxGenerator/Content/Sites.xml b/Neos.SiteKickstarter/Resources/Private/AfxGenerator/Content/Sites.xml
deleted file mode 100755
index dcba85e68f6..00000000000
--- a/Neos.SiteKickstarter/Resources/Private/AfxGenerator/Content/Sites.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
- <site name="{siteName}" state="1" siteResourcesPackageKey="{packageKey}" siteNodeName="{siteNodeName}">
-  <nodes formatVersion="2.0">
-   <node nodeName="{siteNodeName}">
-    <variant workspace="live" nodeType="{packageKey}:Document.Page" sortingIndex="100" version="1" removed="" hidden="" hiddenInIndex="">
-     <dimensions>
-     <f:for each="{dimensions}" as="dimension">
-      <{dimension.identifier}>{dimension.default}</{dimension.identifier}>
-     </f:for>
-     </dimensions>
-     <accessRoles __type="array"/>
-     <properties>
-      <title __type="string">Home</title>
-      <uriPathSegment __type="string">home</uriPathSegment>
-     </properties>
-    </variant>
-    <node nodeName="main">
-     <variant workspace="live" nodeType="Neos.Neos:ContentCollection" sortingIndex="100" version="1" removed="" hidden="" hiddenInIndex="">
-      <dimensions>
-      <f:for each="{dimensions}" as="dimension">
-       <{dimension.identifier}>{dimension.default}</{dimension.identifier}>
-      </f:for>
-      </dimensions>
-      <accessRoles __type="array"/>
-     </variant>
-    </node>
-   </node>
-  </nodes>
- </site>
-</root>

From 6e2bc3ce19d3b79cf33f7162d67b330356154ae8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anke=20H=C3=A4slich?= <anke@neos.io>
Date: Mon, 10 Jun 2024 13:21:23 +0200
Subject: [PATCH 13/26] TASK: Remove unused functions from AfxTemplateGenerator

---
 .../Generator/AfxTemplateGenerator.php        | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php b/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
index e9aa151cde5..dc6118b3b04 100755
--- a/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
+++ b/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
@@ -70,29 +70,6 @@ public function generateSitePackage(string $packageKey, string $siteName) : arra
         return $this->generatedFiles;
     }
 
-    /**
-     * Generate basic root Fusion file.
-     *
-     * @param string $packageKey
-     * @param string $siteName
-     * @throws \Neos\Flow\Package\Exception\UnknownPackageException
-     */
-    protected function generateSitesRootFusion(string $packageKey, string $siteName) : void
-    {
-        $templatePathAndFilename = $this->getResourcePathForFile('Fusion/Root.fusion');
-
-        $contextVariables = [
-            'packageKey' => $packageKey,
-            'siteName' => $siteName,
-            'siteNodeName' => $this->generateSiteNodeName($packageKey)
-        ];
-
-        $fileContent = $this->simpleTemplateRenderer->render($templatePathAndFilename, $contextVariables);
-
-        $sitesRootFusionPathAndFilename = $this->packageManager->getPackage($packageKey)->getResourcesPath() . 'Private/Fusion/Root.fusion';
-        $this->generateFile($sitesRootFusionPathAndFilename, $fileContent);
-    }
-
     /**
      * Render the whole directory of the fusion part
      *
@@ -119,14 +96,6 @@ protected function generateSitesFusionDirectory(string $packageKey, string $site
         );
     }
 
-    /**
-     * Generate site node name based on the given package key
-     */
-    protected function generateSiteNodeName(string $packageKey) : string
-    {
-        return NodeName::transliterateFromString($packageKey)->value;
-    }
-
     /**
      * Generate a example NodeTypes.yaml
      *

From 6c0678ec6de0b10054069a7cb12e386d5a542f25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anke=20H=C3=A4slich?= <anke@neos.io>
Date: Mon, 10 Jun 2024 14:54:25 +0200
Subject: [PATCH 14/26] TASK: Create a custom document node type for the site
 root node

Relates: neos/neos-development-collection#4563
Relates: neos/neos-development-collection#4567
---
 .../Generator/AfxTemplateGenerator.php        | 28 +++++++------------
 .../Fusion/Document/Homepage.fusion           |  1 +
 .../NodeTypes/Document.Homepage.yaml          | 11 ++++++++
 .../Document.Page.yaml}                       |  0
 4 files changed, 22 insertions(+), 18 deletions(-)
 create mode 100644 Neos.SiteKickstarter/Resources/Private/AfxGenerator/Fusion/Document/Homepage.fusion
 create mode 100644 Neos.SiteKickstarter/Resources/Private/AfxGenerator/NodeTypes/Document.Homepage.yaml
 rename Neos.SiteKickstarter/Resources/Private/AfxGenerator/{Configuration/NodeTypes.Document.Page.yaml => NodeTypes/Document.Page.yaml} (100%)

diff --git a/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php b/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
index dc6118b3b04..78551df7222 100755
--- a/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
+++ b/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
@@ -13,7 +13,6 @@
  * source code.
  */
 
-use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Package\PackageManager;
 use Neos\Kickstarter\Service\GeneratorService;
@@ -86,11 +85,8 @@ protected function generateSitesFusionDirectory(string $packageKey, string $site
         $contextVariables['siteNodeName'] = $packageKeyDomainPart;
 
         $fusionRecursiveDirectoryRenderer = new FusionRecursiveDirectoryRenderer();
-
-        $packageDirectory = $this->packageManager->getPackage('Neos.SiteKickstarter')->getResourcesPath();
-
         $fusionRecursiveDirectoryRenderer->renderDirectory(
-            $packageDirectory . 'Private/AfxGenerator/Fusion',
+            $this->getTemplateFolder() . 'Fusion',
             $this->packageManager->getPackage($packageKey)->getResourcesPath() . 'Private/Fusion',
             $contextVariables
         );
@@ -104,16 +100,18 @@ protected function generateSitesFusionDirectory(string $packageKey, string $site
      */
     protected function generateNodeTypesConfiguration(string $packageKey) : void
     {
-        $templatePathAndFilename = $this->getResourcePathForFile('Configuration/NodeTypes.Document.Page.yaml');
+        $templateFolder = $this->getTemplateFolder() . 'NodeTypes';
+        $targetFolder = $this->packageManager->getPackage($packageKey)->getPackagePath() . 'NodeTypes';
 
         $contextVariables = [
             'packageKey' => $packageKey
         ];
 
-        $fileContent = $this->simpleTemplateRenderer->render($templatePathAndFilename, $contextVariables);
-
-        $sitesNodeTypesPathAndFilename = $this->packageManager->getPackage($packageKey)->getConfigurationPath() . 'NodeTypes.Document.Page.yaml';
-        $this->generateFile($sitesNodeTypesPathAndFilename, $fileContent);
+        foreach (Files::readDirectoryRecursively($templateFolder, '.yaml') as $templatePathAndFilename) {
+            $fileContent = $this->simpleTemplateRenderer->render($templatePathAndFilename, $contextVariables);
+            $targetPathAndFilename = str_replace($templateFolder, $targetFolder, $templatePathAndFilename);
+            $this->generateFile($targetPathAndFilename, $fileContent);
+        }
     }
 
     /**
@@ -133,15 +131,9 @@ protected function generateAdditionalFolders(string $packageKey) : void
         }
     }
 
-    /**
-     * returns resource path for the generator
-     *
-     * @param $pathToFile
-     * @return string
-     */
-    protected function getResourcePathForFile(string $pathToFile) : string
+    protected function getTemplateFolder(): string
     {
-        return 'resource://Neos.SiteKickstarter/Private/AfxGenerator/' . $pathToFile;
+        return $this->packageManager->getPackage('Neos.SiteKickstarter')->getResourcesPath() . 'Private/AfxGenerator/';
     }
 
     public function getGeneratorName(): string
diff --git a/Neos.SiteKickstarter/Resources/Private/AfxGenerator/Fusion/Document/Homepage.fusion b/Neos.SiteKickstarter/Resources/Private/AfxGenerator/Fusion/Document/Homepage.fusion
new file mode 100644
index 00000000000..8737907cfcf
--- /dev/null
+++ b/Neos.SiteKickstarter/Resources/Private/AfxGenerator/Fusion/Document/Homepage.fusion
@@ -0,0 +1 @@
+prototype({packageKey}:Document.Homepage) < prototype({packageKey}:Document.AbstractPage)
diff --git a/Neos.SiteKickstarter/Resources/Private/AfxGenerator/NodeTypes/Document.Homepage.yaml b/Neos.SiteKickstarter/Resources/Private/AfxGenerator/NodeTypes/Document.Homepage.yaml
new file mode 100644
index 00000000000..a51a0e66de7
--- /dev/null
+++ b/Neos.SiteKickstarter/Resources/Private/AfxGenerator/NodeTypes/Document.Homepage.yaml
@@ -0,0 +1,11 @@
+# This is a custom root node type which has been auto-generated for your site package
+# by Neos. You can customize this to your needs.
+'{packageKey}:Document.Homepage':
+  superTypes:
+    'Neos.Neos:Site': true
+  ui:
+    icon: globe
+    label: '{packageKey} Homepage'
+  childNodes:
+    main:
+      type: 'Neos.Neos:ContentCollection'
diff --git a/Neos.SiteKickstarter/Resources/Private/AfxGenerator/Configuration/NodeTypes.Document.Page.yaml b/Neos.SiteKickstarter/Resources/Private/AfxGenerator/NodeTypes/Document.Page.yaml
similarity index 100%
rename from Neos.SiteKickstarter/Resources/Private/AfxGenerator/Configuration/NodeTypes.Document.Page.yaml
rename to Neos.SiteKickstarter/Resources/Private/AfxGenerator/NodeTypes/Document.Page.yaml

From 82d54ce9a8f98fffbe4e7988acd654e7234a4b8c Mon Sep 17 00:00:00 2001
From: Karsten Dambekalns <karsten@dambekalns.de>
Date: Tue, 11 Jun 2024 17:40:17 +0200
Subject: [PATCH 15/26] TASK: Tweak README

This converts the `Readme.rst` to Markdown and splits it into two
separate files, `README.md` and `CONTRIBUTING.md` as is convention
these days.
---
 CONTRIBUTING.md | 134 +++++++++++++++++++++++++++++++
 README.md       |  93 ++++++++++++++++++++++
 Readme.rst      | 208 ------------------------------------------------
 3 files changed, 227 insertions(+), 208 deletions(-)
 create mode 100644 CONTRIBUTING.md
 create mode 100644 README.md
 delete mode 100644 Readme.rst

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000000..0ff168555fc
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,134 @@
+# Contributing
+
+**For (specific) Notes on Neos 9, see further down…**
+
+If you want to contribute to Neos and want to set up a development environment, then follow these steps:
+
+```shell
+composer create-project neos/neos-development-distribution neos-development 8.3.x-dev --keep-vcs
+```
+
+Note the **-distribution** repository you create a project from, instead of just checking out this repository.
+
+If you need a different branch, you can either use it from the start (replace the ``8.3.x-dev`` by ``9.0.x-dev`` or whatever you need), or switch after checkout (just make sure to run composer update afterwards to get matching dependencies installed.) In a nutshell, to switch the branch you intend to work on, run:
+
+```shell
+git checkout 9.0 && composer update
+```
+
+The code of the CMS can then be found inside `Packages/Neos`, which itself is the neos-development-collection Git repository. You commit changes and create pull requests from this repository.
+
+- To commit changes to Neos switch into the `Neos` directory (`cd Packages/Neos`) and do all Git-related work (`git add .`, `git commit`, etc) there.
+- If you want to contribute to the Neos UI, please take a look at the explanations at https://github.com/neos/neos-ui#contributing on how to work with that.
+- If you want to contribute to the Flow Framework, you find that inside the `Packages/Framework` folder. See https://github.com/neos/flow-development-collection
+
+In the root directory of the development distribution, you can do the following things:
+
+To run tests, run `./bin/phpunit -c ./Build/BuildEssentials/PhpUnit/UnitTests.xml` for unit tests or `./bin/phpunit -c ./Build/BuildEssentials/PhpUnit/FunctionalTests.xml` for functional/integration tests.
+
+---
+
+**Note**
+
+We use an upmerging strategy: create all bugfixes to the lowest maintained branch that contains the issue. Typically, this is the second last LTS release - see the diagram at https://www.neos.io/features/release-process.html.
+
+  For new features, pull requests should be made against the branch for the next minor version (named like `x.y`). Breaking changes must only go into the branch for the next major version.
+
+---
+
+For more detailed information, see https://discuss.neos.io/t/development-setup/504,
+https://discuss.neos.io/t/creating-a-pull-request/506 and
+https://discuss.neos.io/t/git-branch-handling-in-the-neos-project/6013
+
+
+## Neos 9
+
+
+### Prerequisites
+
+- You need PHP 8.2 installed.
+- Please be sure to run off the Neos development distribution in branch 9.0, to avoid dependency issues.
+
+### Setup
+
+The Event-Sourced Content Repository has a Docker Compose file included in `Neos.ContentRepository.BehavioralTests` which starts both Mariadb and Postgres in compatible versions. Additionally, there exists a helper to change the configuration in your distribution (`/Configuration`) to the correct values matching this database.
+
+Do the following for setting up everything:
+
+1. Start the databases:
+
+   ```shell
+   pushd Packages/Neos/Neos.ContentRepository.BehavioralTests; docker compose up -d; popd
+
+   # to stop the databases:
+   pushd Packages/Neos/Neos.ContentRepository.BehavioralTests; docker compose down; popd
+   # to stop the databases AND remove the stored data:
+   pushd Packages/Neos/Neos.ContentRepository.BehavioralTests; docker compose down -v; popd
+   ```
+
+2. Copy matching Configuration:
+
+   ```shell
+   cp -R Packages/Neos/Neos.ContentRepository.BehavioralTests/DistributionConfigurationTemplate/* Configuration/
+   ```
+
+3. Run Doctrine Migrations:
+
+   ```shell
+   ./flow doctrine:migrate
+   FLOW_CONTEXT=Testing/Postgres ./flow doctrine:migrate
+   ```
+
+4. Setup the Content Repository
+
+   ```shell
+   ./flow cr:setup
+   ```
+
+5. Set up Behat
+
+   ```shell
+   cp -R Packages/Neos/Neos.ContentRepository.BehavioralTests/DistributionBehatTemplate/ Build/Behat
+   pushd Build/Behat/
+   rm composer.lock
+   composer install
+   popd
+   ```
+
+### Running the Tests
+
+The normal mode is running PHP locally, but running Mariadb / Postgres in containers (so we know
+we use the right versions etc).
+
+```shell
+bin/behat -c Packages/Neos/Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist
+```
+
+Running all tests can take a long time, depending on the hardware.
+To speed up the process, Behat tests can be executed in a "synchronous" mode by setting the `CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION` environment variable:
+
+```shell
+CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION=1 bin/behat -c Packages/Neos/Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist
+```
+
+Alternatively, if you want to reproduce errors as they happen inside the CI system, but you
+develop on Mac OS, you might want to run the Behat tests in a Docker container (= a linux environment)
+as well. We have seen cases where they behave differently, i.e. where they run without race
+conditions on OSX, but with race conditions in Linux/Docker. Additionally, the Linux/Docker setup
+described below also makes it easy to run the race-condition-detector:
+
+```shell
+docker compose --project-directory . --file Packages/Neos/Neos.ContentRepository.BehavioralTests/docker-compose-full.yml build
+docker compose --project-directory . --file Packages/Neos/Neos.ContentRepository.BehavioralTests/docker-compose-full.yml up -d
+docker compose --project-directory . --file Packages/Neos/Neos.ContentRepository.BehavioralTests/docker-compose-full.yml run neos /bin/bash
+
+# the following commands now run INSIDE the Neos docker container:
+FLOW_CONTEXT=Testing/Behat ../../../../../flow raceConditionTracker:reset
+
+../../../../../bin/behat -c behat.yml.dist
+
+# To run tests in speed mode, run CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION=1
+CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION=1 ../../../../../bin/behat -c behat.yml.dist
+
+FLOW_CONTEXT=Testing/Behat ../../../../../flow raceConditionTracker:analyzeTrace
+```
diff --git a/README.md b/README.md
new file mode 100644
index 00000000000..b7cb5af08a2
--- /dev/null
+++ b/README.md
@@ -0,0 +1,93 @@
+[![Code
+Climate](https://codeclimate.com/github/neos/neos-development-collection/badges/gpa.svg)](https://codeclimate.com/github/neos/neos-development-collection)
+[![StyleCI](https://styleci.io/repos/40964014/shield?style=flat)](https://styleci.io/repos/40964014)
+[![Latest Stable
+Version](https://poser.pugx.org/neos/neos-development-collection/v/9.0)](https://packagist.org/packages/neos/neos-development-collection)
+[![License](https://poser.pugx.org/neos/neos-development-collection/license)](https://raw.githubusercontent.com/neos/neos-development-collection/9.0/LICENSE)
+[![Documentation](https://img.shields.io/badge/documentation-master-blue.svg)](https://neos.readthedocs.org/en/9.0/)
+[![Slack](http://slack.neos.io/badge.svg)](http://slack.neos.io)
+[![Discussion Forum](https://img.shields.io/badge/forum-Discourse-39c6ff.svg)](https://discuss.neos.io/)
+[![Issues](https://img.shields.io/github/issues/neos/neos-development-collection.svg)](https://github.com/neos/neos-development-collection/issues)
+[![Translation](https://img.shields.io/badge/translate-weblate-85ae52.svg)](https://hosted.weblate.org/projects/neos/)
+[![Twitter](https://img.shields.io/twitter/follow/neoscms.svg?style=social)](https://twitter.com/NeosCMS)
+
+# Neos development collection
+
+This repository is a collection of packages for the Neos content
+application platform (learn more on <https://www.neos.io/>). The
+repository is used for development and all pull requests should go into
+it.
+
+## Installation and Setup
+
+If you want to install Neos, please have a look at the installation &
+setup documentation:
+<https://docs.neos.io/guide/installation-development-setup>
+
+**For (specific) documentation on Neos 9, read on below...**
+
+## Contributing
+
+If you want to contribute to Neos and want to set up a development
+environment, then please read the instructions in [CONTRIBUTING.md](CONTRIBUTING.md)
+
+**For (specific) documentation on Neos 9, read on below...**
+
+## Neos 9 and the Event-Sourced Content Repository (ES CR)
+
+### Prerequisites
+
+- You need PHP 8.2 installed.
+- Please be sure to run off the Neos development distribution in branch 9.0, to avoid dependency issues.
+
+### Setup
+
+Follow the usual configuration steps (as for Neos 8) to install Composer dependencies and configure the database connection in `Settings.yaml` Then:
+
+1.  Run Doctrine Migrations:
+
+    ``` bash
+    ./flow doctrine:migrate
+    FLOW_CONTEXT=Testing/Postgres ./flow doctrine:migrate
+    ```
+
+2.  Setup the Content Repository
+
+    ``` bash
+    ./flow cr:setup
+    ```
+
+### Site Setup
+
+You can chose from one of the following options:
+
+#### Creating a new Site
+
+``` bash
+./flow site:create neosdemo Neos.Demo Neos.Demo:Document.Homepage
+```
+
+#### Migrating an existing (Neos < 9.0) Site
+
+``` bash
+# WORKAROUND: for now, you still need to create a site (which must match the root node name)
+# !! in the future, you would want to import *INTO* a given site (and replace its root node)
+./flow site:create neosdemo Neos.Demo Neos.Demo:Document.Homepage
+
+# the following config points to a Neos 8.0 database (adjust to your needs), created by
+# the legacy "./flow site:import Neos.Demo" command.
+./flow cr:migrateLegacyData --config '{"dbal": {"dbname": "neos80"}, "resourcesPath": "/path/to/neos-8.0/Data/Persistent/Resources"}'
+```
+
+#### Importing an existing (Neos >= 9.0) Site from an Export
+
+``` bash
+# import the event stream from the Neos.Demo package
+./flow cr:import Packages/Sites/Neos.Demo/Resources/Private/Content
+```
+
+### Running Neos
+
+> ``` bash
+> ./flow server:run
+> ```
diff --git a/Readme.rst b/Readme.rst
deleted file mode 100644
index 4f54dd91f31..00000000000
--- a/Readme.rst
+++ /dev/null
@@ -1,208 +0,0 @@
-|Code Climate| |StyleCI| |Latest Stable Version| |License| |Docs| |Slack| |Forum| |Issues| |Translate| |Twitter|
-
-.. |Code Climate| image:: https://codeclimate.com/github/neos/neos-development-collection/badges/gpa.svg
-   :target: https://codeclimate.com/github/neos/neos-development-collection
-.. |StyleCI| image:: https://styleci.io/repos/40964014/shield?style=flat
-   :target: https://styleci.io/repos/40964014
-.. |Latest Stable Version| image:: https://poser.pugx.org/neos/neos-development-collection/v/9.0
-   :target: https://packagist.org/packages/neos/neos-development-collection
-.. |License| image:: https://poser.pugx.org/neos/neos-development-collection/license
-   :target: https://raw.githubusercontent.com/neos/neos-development-collection/9.0/LICENSE
-.. |Docs| image:: https://img.shields.io/badge/documentation-master-blue.svg
-   :target: https://neos.readthedocs.org/en/9.0/
-   :alt: Documentation
-.. |Slack| image:: http://slack.neos.io/badge.svg
-   :target: http://slack.neos.io
-   :alt: Slack
-.. |Forum| image:: https://img.shields.io/badge/forum-Discourse-39c6ff.svg
-   :target: https://discuss.neos.io/
-   :alt: Discussion Forum
-.. |Issues| image:: https://img.shields.io/github/issues/neos/neos-development-collection.svg
-   :target: https://github.com/neos/neos-development-collection/issues
-   :alt: Issues
-.. |Translate| image:: https://img.shields.io/badge/translate-weblate-85ae52.svg
-   :target: https://hosted.weblate.org/projects/neos/
-   :alt: Translation
-.. |Twitter| image:: https://img.shields.io/twitter/follow/neoscms.svg?style=social
-   :target: https://twitter.com/NeosCMS
-   :alt: Twitter
-
----------------------------
-Neos development collection
----------------------------
-
-**FOR DOCS ON THE EVENT SOURCED CONTENT REPOSITORY, READ ON BELOW**
-
-This repository is a collection of packages for the Neos content application platform (learn more on https://www.neos.io/).
-The repository is used for development and all pull requests should go into it.
-
-If you want to install Neos, please have a look at the documentation: https://neos.readthedocs.org/en/latest/
-
-Contributing
-============
-
-If you want to contribute to Neos and want to set up a development environment, then follow these steps:
-
-``composer create-project neos/neos-development-distribution neos-development 8.3.x-dev --keep-vcs``
-
-Note the **-distribution** repository you create a project from, instead of just checking out this repository.
-
-If you need a different branch, you can either use it from the start (replace the ``8.3.x-dev`` by ``9.0.x-dev`` or whatever you need), or switch after checkout (just make sure to run composer update afterwards to get matching dependencies installed.) In a nutshell, to switch the branch you intend to work on, run:
-
-``git checkout 9.0 && composer update``
-
-The code of the CMS can then be found inside ``Packages/Neos``, which itself is the neos-development-collection Git repository. You commit changes and create pull requests from this repository.
-
-- To commit changes to Neos switch into the ``Neos`` directory (``cd Packages/Neos``) and do all Git-related work (``git add .``, ``git commit``, etc) there.
-- If you want to contribute to the Neos UI, please take a look at the explanations at https://github.com/neos/neos-ui#contributing on how to work with that.
-- If you want to contribute to the Flow Framework, you find that inside the ``Packages/Framework`` folder. See https://github.com/neos/flow-development-collection
-
-In the root directory of the development distribution, you can do the following things:
-
-To run tests, run ``./bin/phpunit -c ./Build/BuildEssentials/PhpUnit/UnitTests.xml`` for unit tests or ``./bin/phpunit -c ./Build/BuildEssentials/PhpUnit/FunctionalTests.xml`` for functional/integration tests.
-
-.. note:: We use an upmerging strategy: create all bugfixes to the lowest maintained branch that contains the issue. Typically, this is the second last LTS release - see the diagram at https://www.neos.io/features/release-process.html.
-
-  For new features, pull requests should be made against the branch for the next minor version (named like ``x.y``). Breaking changes must only go into the branch for the next major version.
-
-For more detailed information, see https://discuss.neos.io/t/development-setup/504,
-https://discuss.neos.io/t/creating-a-pull-request/506 and
-https://discuss.neos.io/t/git-branch-handling-in-the-neos-project/6013
-
-
-----------------------------------------------
-New (Event Sourced) Content Repository (ES CR)
-----------------------------------------------
-
-Prerequisites
-=============
-
-- You need PHP 8.2 installed.
-- You need a recent MySQL/MariaDB (PostgreSQL ist not yet supported)
-- Please be sure to run off the Neos-Development-Distribution in Branch 9.0, to avoid dependency issues (as described above).
-
-Setup
-=====
-
-The ES CR has a Docker-compose file included in `Neos.ContentRepository.BehavioralTests` which starts both
-Mariadb and Postgres in compatible versions. Additionally, there exists a helper to change the configuration
-in your distribution (`/Configuration`) to the correct values matching this database.
-
-Do the following for setting up everything:
-
-1. Start the databases:
-
-   .. code-block:: bash
-
-       pushd Packages/Neos/Neos.ContentRepository.BehavioralTests; docker compose up -d; popd
-
-       # to stop the databases:
-       pushd Packages/Neos/Neos.ContentRepository.BehavioralTests; docker compose down; popd
-       # to stop the databases AND remove the stored data:
-       pushd Packages/Neos/Neos.ContentRepository.BehavioralTests; docker compose down -v; popd
-
-2. Copy matching Configuration:
-
-   .. code-block:: bash
-
-       cp -R Packages/Neos/Neos.ContentRepository.BehavioralTests/DistributionConfigurationTemplate/* Configuration/
-
-3. Run Doctrine Migrations:
-
-   .. code-block:: bash
-
-       ./flow doctrine:migrate
-       FLOW_CONTEXT=Testing/Postgres ./flow doctrine:migrate
-
-4. Setup the Content Repository
-
-   .. code-block:: bash
-
-       ./flow cr:setup
-
-5. Set up Behat
-
-   .. code-block:: bash
-
-       cp -R Packages/Neos/Neos.ContentRepository.BehavioralTests/DistributionConfigurationTemplate/ Build/Behat
-       pushd Build/Behat/
-       rm composer.lock
-       composer install
-       popd
-
-Site Setup
-==========
-
-You can chose from one of the following options:
-
-Creating a new Site
--------------------
-
-.. code-block:: bash
-
-    ./flow site:create neosdemo Neos.Demo Neos.Demo:Document.Homepage
-
-
-Migrating an existing (Neos < 9.0) Site
----------------------------------------
-
-.. code-block:: bash
-
-    # WORKAROUND: for now, you still need to create a site (which must match the root node name)
-    # !! in the future, you would want to import *INTO* a given site (and replace its root node)
-    ./flow site:create neosdemo Neos.Demo Neos.Demo:Document.Homepage
-
-    # the following config points to a Neos 8.0 database (adjust to your needs), created by
-    # the legacy "./flow site:import Neos.Demo" command.
-    ./flow cr:migrateLegacyData --config '{"dbal": {"dbname": "neos80"}, "resourcesPath": "/path/to/neos-8.0/Data/Persistent/Resources"}'
-
-    # TODO: this JSON config is hard to write - we should change this soonish.
-
-
-
-Importing an existing (Neos >= 9.0) Site from an Export
--------------------------------------------------------
-
-.. code-block:: bash
-
-    # import the event stream from the Neos.Demo package
-    ./flow cr:import Packages/Sites/Neos.Demo/Resources/Private/Content
-
-
-Running Neos
-============
-
-   .. code-block:: bash
-
-       ./flow server:run
-
-
-Running the Tests
-=================
-
-The normal mode is running PHP locally, but running Mariadb / Postgres in containers (so we know
-we use the right versions etc).
-
-   .. code-block:: bash
-
-       cd Packages/Neos
-       composer test:behavioral
-
-Alternatively, if you want to reproduce errors as they happen inside the CI system, but you
-develop on Mac OS, you might want to run the Behat tests in a Docker container (= a linux environment)
-as well. We have seen cases where they behave differently, i.e. where they run without race
-conditions on OSX, but with race conditions in Linux/Docker. Additionally, the Linux/Docker setup
-described below also makes it easy to run the race-condition-detector:
-
-   .. code-block:: bash
-
-       docker compose --project-directory . --file Packages/Neos/Neos.ContentRepository.BehavioralTests/docker-compose-full.yml build
-       docker compose --project-directory . --file Packages/Neos/Neos.ContentRepository.BehavioralTests/docker-compose-full.yml up -d
-       docker compose --project-directory . --file Packages/Neos/Neos.ContentRepository.BehavioralTests/docker-compose-full.yml run neos /bin/bash
-
-       # the following commands now run INSIDE the Neos docker container:
-       FLOW_CONTEXT=Testing/Behat ../../../../../flow raceConditionTracker:reset
-
-       ../../../../../bin/behat -c behat.yml.dist
-
-       FLOW_CONTEXT=Testing/Behat ../../../../../flow raceConditionTracker:analyzeTrace

From ee25eaee42bb56d045f1b6d585c1f22badf2dced Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Wed, 12 Jun 2024 19:57:15 +0200
Subject: [PATCH 16/26] TASK: Introduce php-stan level 8 to
 `Neos.SiteKickstarter`

---
 .../Command/KickstartCommandController.php    |  3 +-
 .../Generator/AfxTemplateGenerator.php        | 54 +++++++++----------
 .../SitePackageGeneratorInterface.php         |  2 +-
 .../FusionRecursiveDirectoryRenderer.php      | 10 ++--
 .../Service/SimpleTemplateRenderer.php        |  5 +-
 .../SiteGeneratorCollectingService.php        |  3 ++
 .../SitePackageGeneratorNameService.php       |  5 +-
 phpstan.neon.dist                             |  1 +
 8 files changed, 45 insertions(+), 38 deletions(-)

diff --git a/Neos.SiteKickstarter/Classes/Command/KickstartCommandController.php b/Neos.SiteKickstarter/Classes/Command/KickstartCommandController.php
index 1e9dabe5cd2..34113608867 100755
--- a/Neos.SiteKickstarter/Classes/Command/KickstartCommandController.php
+++ b/Neos.SiteKickstarter/Classes/Command/KickstartCommandController.php
@@ -49,7 +49,7 @@ class KickstartCommandController extends CommandController
      * @param string $packageKey The packageKey for your site
      * @param string $siteName The siteName of your site
      */
-    public function siteCommand($packageKey, $siteName)
+    public function siteCommand($packageKey, $siteName): void
     {
         if (!$this->packageManager->isPackageKeyValid($packageKey)) {
             $this->outputLine('Package key "%s" is not valid. Only UpperCamelCase in the format "Vendor.PackageKey", please!', [$packageKey]);
@@ -72,6 +72,7 @@ public function siteCommand($packageKey, $siteName)
             $nameToClassMap[$name] = $generatorClass;
         }
 
+        /** @var string $generatorName */
         $generatorName = $this->output->select(
             sprintf('What generator do you want to use? (<info>%s</info>): ', array_key_first($selection)),
             $selection,
diff --git a/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php b/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
index 78551df7222..fc64a3f70b5 100755
--- a/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
+++ b/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
@@ -14,6 +14,7 @@
  */
 
 use Neos\Flow\Annotations as Flow;
+use Neos\Flow\Package\FlowPackageInterface;
 use Neos\Flow\Package\PackageManager;
 use Neos\Kickstarter\Service\GeneratorService;
 use Neos\SiteKickstarter\Service\FusionRecursiveDirectoryRenderer;
@@ -43,7 +44,7 @@ class AfxTemplateGenerator extends GeneratorService implements SitePackageGenera
      *
      * @param string $packageKey
      * @param string $siteName
-     * @return array
+     * @return list<string>
      * @throws \Neos\Flow\Composer\Exception\InvalidConfigurationException
      * @throws \Neos\Flow\Package\Exception
      * @throws \Neos\Flow\Package\Exception\CorruptPackageException
@@ -55,56 +56,57 @@ class AfxTemplateGenerator extends GeneratorService implements SitePackageGenera
      */
     public function generateSitePackage(string $packageKey, string $siteName) : array
     {
-        $this->packageManager->createPackage($packageKey, [
+        $package = $this->packageManager->createPackage($packageKey, [
             'type' => 'neos-site',
-            "require" => [
-                "neos/neos" => "*"
+            'require' => [
+                'neos/neos' => '*'
             ]
         ]);
 
-        $this->generateSitesFusionDirectory($packageKey, $siteName);
-        $this->generateNodeTypesConfiguration($packageKey);
-        $this->generateAdditionalFolders($packageKey);
+        if (!$package instanceof FlowPackageInterface) {
+            throw new \RuntimeException('Expected to generate flow site package for "' . $packageKey . '" but got ' . get_class($package));
+        }
+
+        $this->generateSitesFusionDirectory($package, $siteName);
+        $this->generateNodeTypesConfiguration($package);
+        $this->generateAdditionalFolders($package);
 
         return $this->generatedFiles;
     }
 
     /**
      * Render the whole directory of the fusion part
-     *
-     * @param $packageKey
-     * @param $siteName
-     * @throws \Neos\Flow\Package\Exception\UnknownPackageException
      */
-    protected function generateSitesFusionDirectory(string $packageKey, string $siteName) : void
+    protected function generateSitesFusionDirectory(FlowPackageInterface $package, string $siteName) : void
     {
+        $packageKey = $package->getPackageKey();
         $contextVariables = [];
         $contextVariables['packageKey'] = $packageKey;
         $contextVariables['siteName'] = $siteName;
-        $packageKeyDomainPart = substr(strrchr($packageKey, '.'), 1) ?: $packageKey;
+        $packageKeyDomainPart = $packageKey;
+        if ($lastPackagePartWithDot = strrchr($packageKey, '.')) {
+            $packageKeyDomainPart = substr($lastPackagePartWithDot, 1) ?: $packageKey;
+        }
         $contextVariables['siteNodeName'] = $packageKeyDomainPart;
 
         $fusionRecursiveDirectoryRenderer = new FusionRecursiveDirectoryRenderer();
         $fusionRecursiveDirectoryRenderer->renderDirectory(
             $this->getTemplateFolder() . 'Fusion',
-            $this->packageManager->getPackage($packageKey)->getResourcesPath() . 'Private/Fusion',
+            $package->getResourcesPath() . 'Private/Fusion',
             $contextVariables
         );
     }
 
     /**
      * Generate a example NodeTypes.yaml
-     *
-     * @param string $packageKey
-     * @throws \Neos\Flow\Package\Exception\UnknownPackageException
      */
-    protected function generateNodeTypesConfiguration(string $packageKey) : void
+    protected function generateNodeTypesConfiguration(FlowPackageInterface $package) : void
     {
         $templateFolder = $this->getTemplateFolder() . 'NodeTypes';
-        $targetFolder = $this->packageManager->getPackage($packageKey)->getPackagePath() . 'NodeTypes';
+        $targetFolder = $package->getPackagePath() . 'NodeTypes';
 
         $contextVariables = [
-            'packageKey' => $packageKey
+            'packageKey' => $package->getPackageKey(),
         ];
 
         foreach (Files::readDirectoryRecursively($templateFolder, '.yaml') as $templatePathAndFilename) {
@@ -116,14 +118,10 @@ protected function generateNodeTypesConfiguration(string $packageKey) : void
 
     /**
      * Generate additional folders for site packages.
-     *
-     * @param string $packageKey
-     * @throws \Neos\Flow\Package\Exception\UnknownPackageException
-     * @throws \Neos\Utility\Exception\FilesException
      */
-    protected function generateAdditionalFolders(string $packageKey) : void
+    protected function generateAdditionalFolders(FlowPackageInterface $package) : void
     {
-        $resourcesPath = $this->packageManager->getPackage($packageKey)->getResourcesPath();
+        $resourcesPath = $package->getResourcesPath();
         $publicResourcesPath = Files::concatenatePaths([$resourcesPath, 'Public']);
 
         foreach (['Images', 'JavaScript', 'Styles'] as $publicResourceFolder) {
@@ -133,7 +131,9 @@ protected function generateAdditionalFolders(string $packageKey) : void
 
     protected function getTemplateFolder(): string
     {
-        return $this->packageManager->getPackage('Neos.SiteKickstarter')->getResourcesPath() . 'Private/AfxGenerator/';
+        $currentPackage = $this->packageManager->getPackage('Neos.SiteKickstarter');
+        assert($currentPackage instanceof FlowPackageInterface);
+        return $currentPackage->getResourcesPath() . 'Private/AfxGenerator/';
     }
 
     public function getGeneratorName(): string
diff --git a/Neos.SiteKickstarter/Classes/Generator/SitePackageGeneratorInterface.php b/Neos.SiteKickstarter/Classes/Generator/SitePackageGeneratorInterface.php
index b833a6ab5ef..f74c5f73f36 100755
--- a/Neos.SiteKickstarter/Classes/Generator/SitePackageGeneratorInterface.php
+++ b/Neos.SiteKickstarter/Classes/Generator/SitePackageGeneratorInterface.php
@@ -20,7 +20,7 @@ interface SitePackageGeneratorInterface
      *
      * @param string $packageKey
      * @param string $siteName
-     * @return array
+     * @return list<string>
      */
     public function generateSitePackage(string $packageKey, string $siteName): array;
 
diff --git a/Neos.SiteKickstarter/Classes/Service/FusionRecursiveDirectoryRenderer.php b/Neos.SiteKickstarter/Classes/Service/FusionRecursiveDirectoryRenderer.php
index d93c5eb8109..01a1e59a025 100755
--- a/Neos.SiteKickstarter/Classes/Service/FusionRecursiveDirectoryRenderer.php
+++ b/Neos.SiteKickstarter/Classes/Service/FusionRecursiveDirectoryRenderer.php
@@ -28,16 +28,18 @@ class FusionRecursiveDirectoryRenderer
      *
      * @param string $srcDirectory
      * @param string $targetDirectory
-     * @param array $variables
+     * @param array<string, string> $variables
      * @throws \Neos\Utility\Exception\FilesException
      */
-    public function renderDirectory(string $srcDirectory, string $targetDirectory, array $variables)
+    public function renderDirectory(string $srcDirectory, string $targetDirectory, array $variables): void
     {
-        $files = scandir($srcDirectory);
+        $files = scandir($srcDirectory) ?: [];
 
         foreach ($files as $key => $value) {
             $path = realpath($srcDirectory . DIRECTORY_SEPARATOR . $value);
-
+            if ($path === false) {
+                throw new \RuntimeException('Could not read directory "' . $srcDirectory . DIRECTORY_SEPARATOR . $value . '".');
+            }
             $targetPath = $targetDirectory . DIRECTORY_SEPARATOR . $value;
 
             if (!is_dir($path)) {
diff --git a/Neos.SiteKickstarter/Classes/Service/SimpleTemplateRenderer.php b/Neos.SiteKickstarter/Classes/Service/SimpleTemplateRenderer.php
index 168dd82bdf8..089f7b9a4cc 100755
--- a/Neos.SiteKickstarter/Classes/Service/SimpleTemplateRenderer.php
+++ b/Neos.SiteKickstarter/Classes/Service/SimpleTemplateRenderer.php
@@ -20,12 +20,15 @@ class SimpleTemplateRenderer
      * contextVariables array
      *
      * @param string $templatePathAndFilename
-     * @param array $contextVariables
+     * @param array<string, string> $contextVariables
      * @return string
      */
     public function render(string $templatePathAndFilename, array $contextVariables) : string
     {
         $content = file_get_contents($templatePathAndFilename);
+        if ($content === false) {
+            throw new \RuntimeException(sprintf('Could not read template file "%s".', $templatePathAndFilename));
+        }
         foreach ($contextVariables as $key => $value) {
             $content = str_replace('{' . $key . '}', $value, $content);
         }
diff --git a/Neos.SiteKickstarter/Classes/Service/SiteGeneratorCollectingService.php b/Neos.SiteKickstarter/Classes/Service/SiteGeneratorCollectingService.php
index 378a546d6d0..96c95af8718 100644
--- a/Neos.SiteKickstarter/Classes/Service/SiteGeneratorCollectingService.php
+++ b/Neos.SiteKickstarter/Classes/Service/SiteGeneratorCollectingService.php
@@ -25,6 +25,9 @@ class SiteGeneratorCollectingService
      */
     protected $reflectionService;
 
+    /**
+     * @return list<class-string<SitePackageGeneratorInterface>>
+     */
     public function getAllGenerators(): array
     {
         return $this->reflectionService->getAllImplementationClassNamesForInterface(SitePackageGeneratorInterface::class);
diff --git a/Neos.SiteKickstarter/Classes/Service/SitePackageGeneratorNameService.php b/Neos.SiteKickstarter/Classes/Service/SitePackageGeneratorNameService.php
index fcadc776686..33f95cdfa36 100755
--- a/Neos.SiteKickstarter/Classes/Service/SitePackageGeneratorNameService.php
+++ b/Neos.SiteKickstarter/Classes/Service/SitePackageGeneratorNameService.php
@@ -26,13 +26,10 @@ class SitePackageGeneratorNameService
     protected $objectManager;
 
     /**
-     * @param string $generatorClass fully qualified namespace
+     * @param class-string<SitePackageGeneratorInterface> $generatorClass fully qualified namespace
      */
     public function getNameOfSitePackageGenerator(string $generatorClass) : string
     {
-        /**
-         * @var $generator SitePackageGeneratorInterface
-         */
         $generator = $this->objectManager->get($generatorClass);
 
         return $generator->getGeneratorName();
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index c157d6569f9..07203fbad85 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -18,6 +18,7 @@ parameters:
         - Neos.ContentRepositoryRegistry/Classes
         - Neos.Neos/Classes
         - Neos.TimeableNodeVisibility/Classes
+        - Neos.SiteKickstarter/Classes
         - Neos.NodeTypes.Form/Classes
         # todo lint whole fusion package
         - Neos.Fusion/Classes/Core

From 8340466b0ab7fe77f5f2c36b3136b69953e1eb7f Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Wed, 12 Jun 2024 21:49:38 +0200
Subject: [PATCH 17/26] TASK: Remove `createSitePackage` action

Triggering the creation of a composer package via `Neos.SiteKickstarter` from the web will be removed

See discussion regarding fragile GUI setups and the preferred use of cli instead: https://github.com/neos/neos-development-collection/issues/4243
---
 .../Module/Administration/SitesController.php | 86 +------------------
 .../Module/Administration/Sites/NewSite.html  | 34 --------
 .../Private/Translations/en/Modules.xlf       | 27 ------
 3 files changed, 3 insertions(+), 144 deletions(-)

diff --git a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
index 7ee46bbe473..1c047fc9b4d 100755
--- a/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
+++ b/Neos.Neos/Classes/Controller/Module/Administration/SitesController.php
@@ -233,13 +233,9 @@ public function updateSiteAction(Site $site, $newSiteNodeName)
     }
 
     /**
-     * Create a new site form.
-     *
-     * @param Site $site Site to create
-     * @Flow\IgnoreValidation("$site")
-     * @return void
+     * Create a new site form
      */
-    public function newSiteAction(Site $site = null)
+    public function newSiteAction(): void
     {
         // This is not 100% correct, but it is as good as we can get it to work right now
         try {
@@ -259,88 +255,12 @@ public function newSiteAction(Site $site = null)
 
         $sitePackages = $this->packageManager->getFilteredPackages('available', 'neos-site');
 
-        $generatorServiceIsAvailable = $this->packageManager->isPackageAvailable('Neos.SiteKickstarter');
-        $generatorServices = [];
-
-        if ($generatorServiceIsAvailable) {
-            /** @var SiteGeneratorCollectingService $siteGeneratorCollectingService */
-            $siteGeneratorCollectingService = $this->objectManager->get(SiteGeneratorCollectingService::class);
-            /** @var SitePackageGeneratorNameService $sitePackageGeneratorNameService */
-            $sitePackageGeneratorNameService = $this->objectManager->get(SitePackageGeneratorNameService::class);
-
-            $generatorClasses = $siteGeneratorCollectingService->getAllGenerators();
-
-            foreach ($generatorClasses as $generatorClass) {
-                $name = $sitePackageGeneratorNameService->getNameOfSitePackageGenerator($generatorClass);
-                $generatorServices[$generatorClass] = $name;
-            }
-        }
-
         $this->view->assignMultiple([
             'sitePackages' => $sitePackages,
-            'documentNodeTypes' => $documentNodeTypes,
-            'site' => $site,
-            'generatorServiceIsAvailable' => $generatorServiceIsAvailable,
-            'generatorServices' => $generatorServices
+            'documentNodeTypes' => $documentNodeTypes
         ]);
     }
 
-    /**
-     * Create a new site-package and directly import it.
-     *
-     * @param string $packageKey Package Name to create
-     * @param string $generatorClass Generator Class to generate the site package
-     * @param string $siteName Site Name to create
-     * @Flow\Validate(argumentName="$packageKey", type="\Neos\Neos\Validation\Validator\PackageKeyValidator")
-     * @return void
-     */
-    public function createSitePackageAction(string $packageKey, string $generatorClass, string $siteName): void
-    {
-        if ($this->packageManager->isPackageAvailable('Neos.SiteKickstarter') === false) {
-            $this->addFlashMessage(
-                $this->getModuleLabel('sites.missingPackage.body', ['Neos.SiteKickstarter']),
-                $this->getModuleLabel('sites.missingPackage.title'),
-                Message::SEVERITY_ERROR,
-                [],
-                1475736232
-            );
-            $this->redirect('index');
-        }
-
-        if ($this->packageManager->isPackageAvailable($packageKey)) {
-            $this->addFlashMessage(
-                $this->getModuleLabel('sites.invalidPackageKey.body', [htmlspecialchars($packageKey)]),
-                $this->getModuleLabel('sites.invalidPackageKey.title'),
-                Message::SEVERITY_ERROR,
-                [],
-                1412372021
-            );
-            $this->redirect('index');
-        }
-        // this should never happen, but if somebody posts unexpected data to the form,
-        // it should stop here and return some readable error message
-        if ($this->objectManager->has($generatorClass) === false) {
-            $this->addFlashMessage(
-                'The generator class "%s" is not present.',
-                'Missing generator class',
-                Message::SEVERITY_ERROR,
-                [$generatorClass]
-            );
-            $this->redirect('index');
-        }
-
-        /** @var SitePackageGeneratorInterface $generatorService */
-        $generatorService = $this->objectManager->get($generatorClass);
-        $generatorService->generateSitePackage($packageKey, $siteName);
-
-        $this->controllerContext->getFlashMessageContainer()->addMessage(new Message(sprintf(
-            $this->getModuleLabel('sites.sitePackagesWasCreated.body', [htmlspecialchars($packageKey)]),
-            '',
-            null
-        )));
-        $this->forward('importSite', null, null, ['packageKey' => $packageKey]);
-    }
-
     /**
      * Import a site from site package.
      *
diff --git a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
index 27d33f25da9..fc2a4a830c0 100644
--- a/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
+++ b/Neos.Neos/Resources/Private/Templates/Module/Administration/Sites/NewSite.html
@@ -59,40 +59,6 @@ <h2>{neos:backend.translate(id: 'sites.new', value: 'New site', source: 'Modules
         </f:if>
       </fieldset>
     </f:form>
-
-    <f:form action="createSitePackage">
-      <fieldset class="neos-span3 neos-offset1">
-        <legend>{neos:backend.translate(id: 'sites.createPackage', value: 'Create a new site-package', source: 'Modules')}</legend>
-        <f:if condition="{generatorServiceIsAvailable}">
-          <f:then>
-            <div class="neos-control-group{f:validation.ifHasErrors(for: 'packageKey', then: ' neos-error')}">
-              <label class="neos-control-label" for="package-key">{neos:backend.translate(id: 'packageKey', value: 'Package key', source: 'Modules')}</label>
-              <div class="neos-controls">
-                <f:form.textfield name="packageKey" value="{packageKey}" id="package-key" class="neos-span12" placeholder="{neos:backend.translate(id: 'sites.validPackageKeyInfo', value: 'VendorName.MyPackageKey')}" />
-                <f:render partial="Module/Shared/FieldValidationResults" arguments="{fieldname: 'packageKey'}"/>
-              </div>
-            </div>
-            <div class="neos-control-group{f:validation.ifHasErrors(for: 'siteName', then: ' neos-error')}">
-              <label class="neos-control-label" for="site-name">{neos:backend.translate(id: 'sites.name', value: 'Site name', source: 'Modules')}</label>
-              <div class="neos-controls">
-                <f:form.textfield name="siteName" value="{siteName}" id="site-name" />
-                <f:render partial="Module/Shared/FieldValidationResults" arguments="{fieldname: 'siteName'}"/>
-              </div>
-            </div>
-            <div class="neos-control-group{f:validation.ifHasErrors(for: 'generatorClass', then: ' neos-error')}">
-              <label class="neos-control-label" for="node-type">{neos:backend.translate(id: 'sites.generatorClass', value: 'Select a site generator', source: 'Modules')}</label>
-              <div class="neos-controls neos-select">
-                <f:form.select name="generatorClass" options="{generatorServices}" id="generator-class" class="neos-span12" />
-              </div>
-            </div>
-            <f:form.submit value="{neos:backend.translate(id: 'sites.createPackage', value: 'Create Site-Package', source: 'Modules')}" class="neos-button neos-button-primary" />
-          </f:then>
-          <f:else>
-            <p>{neos:backend.translate(id: 'sites.noNeosKickstarterInfo', value: 'The <em>Neos Kickstarter</em> package is not installed, install it to kickstart new sites.', source: 'Modules') -> f:format.raw()}</p>
-          </f:else>
-        </f:if>
-      </fieldset>
-    </f:form>
   </div>
   <div class="neos-footer">
     <f:link.action action="index" class="neos-button">{neos:backend.translate(id: 'cancel', value: 'Cancel')}</f:link.action>
diff --git a/Neos.Neos/Resources/Private/Translations/en/Modules.xlf b/Neos.Neos/Resources/Private/Translations/en/Modules.xlf
index e036fdaad44..b9bcdca544e 100755
--- a/Neos.Neos/Resources/Private/Translations/en/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/en/Modules.xlf
@@ -374,27 +374,15 @@
 			<trans-unit id="sites.documentType" xml:space="preserve">
 				<source>Select a document nodeType</source>
 			</trans-unit>
-			<trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-			</trans-unit>
 			<trans-unit id="sites.name" xml:space="preserve">
 				<source>Site name</source>
 			</trans-unit>
 			<trans-unit id="sites.createNode" xml:space="preserve">
 				<source>Create empty site</source>
 			</trans-unit>
-			<trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-			</trans-unit>
-			<trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-			</trans-unit>
 			<trans-unit id="sites.noSitesAvailable" xml:space="preserve">
 				<source>No sites available</source>
 			</trans-unit>
-			<trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-			</trans-unit>
 			<trans-unit id="sites.new" xml:space="preserve">
 				<source>New site</source>
 			</trans-unit>
@@ -553,21 +541,6 @@ Click on one of the nodes to only see its fallbacks and variants. Click again to
 			<trans-unit id="sites.update.body" xml:space="preserve">
 				<source>The site "{0}" has been updated.</source>
 			</trans-unit>
-			<trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-			</trans-unit>
-			<trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-			</trans-unit>
-			<trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-			</trans-unit>
-			<trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-			</trans-unit>
-			<trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>Site package {0} was created.</source>
-			</trans-unit>
 			<trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
 				<source>The site has been imported.</source>
 			</trans-unit>

From c93bdbe75f38c9423d83153dc8200950c4ccef0a Mon Sep 17 00:00:00 2001
From: Jenkins <jenkins@neos.io>
Date: Thu, 13 Jun 2024 07:42:53 +0000
Subject: [PATCH 18/26] TASK: Update references [skip ci]

---
 Neos.Neos/Documentation/References/CommandReference.rst         | 2 +-
 Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst | 2 +-
 Neos.Neos/Documentation/References/ViewHelpers/Form.rst         | 2 +-
 Neos.Neos/Documentation/References/ViewHelpers/Media.rst        | 2 +-
 Neos.Neos/Documentation/References/ViewHelpers/Neos.rst         | 2 +-
 Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Neos.Neos/Documentation/References/CommandReference.rst b/Neos.Neos/Documentation/References/CommandReference.rst
index b5421c03517..6a2b61c619b 100644
--- a/Neos.Neos/Documentation/References/CommandReference.rst
+++ b/Neos.Neos/Documentation/References/CommandReference.rst
@@ -19,7 +19,7 @@ commands that may be available, use::
 
   ./flow help
 
-The following reference was automatically generated from code on 2024-06-05
+The following reference was automatically generated from code on 2024-06-13
 
 
 .. _`Neos Command Reference: NEOS.FLOW`:
diff --git a/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst b/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst
index 74e5cfa9bcc..9422cebb7fd 100644
--- a/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst
+++ b/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst
@@ -3,7 +3,7 @@
 FluidAdaptor ViewHelper Reference
 #################################
 
-This reference was automatically generated from code on 2024-06-05
+This reference was automatically generated from code on 2024-06-13
 
 
 .. _`FluidAdaptor ViewHelper Reference: f:debug`:
diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Form.rst b/Neos.Neos/Documentation/References/ViewHelpers/Form.rst
index 450f25eede9..54768bc013e 100644
--- a/Neos.Neos/Documentation/References/ViewHelpers/Form.rst
+++ b/Neos.Neos/Documentation/References/ViewHelpers/Form.rst
@@ -3,7 +3,7 @@
 Form ViewHelper Reference
 #########################
 
-This reference was automatically generated from code on 2024-06-05
+This reference was automatically generated from code on 2024-06-13
 
 
 .. _`Form ViewHelper Reference: neos.form:form`:
diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Media.rst b/Neos.Neos/Documentation/References/ViewHelpers/Media.rst
index f141c56f1ef..0f4965d8def 100644
--- a/Neos.Neos/Documentation/References/ViewHelpers/Media.rst
+++ b/Neos.Neos/Documentation/References/ViewHelpers/Media.rst
@@ -3,7 +3,7 @@
 Media ViewHelper Reference
 ##########################
 
-This reference was automatically generated from code on 2024-06-05
+This reference was automatically generated from code on 2024-06-13
 
 
 .. _`Media ViewHelper Reference: neos.media:fileTypeIcon`:
diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst b/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst
index e826265f3fe..cf5ffd46929 100644
--- a/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst
+++ b/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst
@@ -3,7 +3,7 @@
 Neos ViewHelper Reference
 #########################
 
-This reference was automatically generated from code on 2024-06-05
+This reference was automatically generated from code on 2024-06-13
 
 
 .. _`Neos ViewHelper Reference: neos:backend.authenticationProviderLabel`:
diff --git a/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst b/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst
index 52e2d06a4d0..0d0f5c7fdde 100644
--- a/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst
+++ b/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst
@@ -3,7 +3,7 @@
 TYPO3 Fluid ViewHelper Reference
 ################################
 
-This reference was automatically generated from code on 2024-06-05
+This reference was automatically generated from code on 2024-06-13
 
 
 .. _`TYPO3 Fluid ViewHelper Reference: f:alias`:

From 5b7a728ff9762cd0d67317a7f47b142606db2c3f Mon Sep 17 00:00:00 2001
From: Karsten Dambekalns <karsten@dambekalns.de>
Date: Thu, 13 Jun 2024 10:15:57 +0200
Subject: [PATCH 19/26] TASK: Update CONTRIBUTING.md following feedback

---
 CONTRIBUTING.md | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 0ff168555fc..cf65451b640 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -101,14 +101,8 @@ The normal mode is running PHP locally, but running Mariadb / Postgres in contai
 we use the right versions etc).
 
 ```shell
-bin/behat -c Packages/Neos/Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist
-```
-
-Running all tests can take a long time, depending on the hardware.
-To speed up the process, Behat tests can be executed in a "synchronous" mode by setting the `CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION` environment variable:
-
-```shell
-CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION=1 bin/behat -c Packages/Neos/Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist
+ cd Packages/Neos
+ composer test:behavioral
 ```
 
 Alternatively, if you want to reproduce errors as they happen inside the CI system, but you
@@ -127,8 +121,5 @@ FLOW_CONTEXT=Testing/Behat ../../../../../flow raceConditionTracker:reset
 
 ../../../../../bin/behat -c behat.yml.dist
 
-# To run tests in speed mode, run CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION=1
-CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION=1 ../../../../../bin/behat -c behat.yml.dist
-
 FLOW_CONTEXT=Testing/Behat ../../../../../flow raceConditionTracker:analyzeTrace
 ```

From e640872c9f1c750fbfaea9ec4d042bca5154363e Mon Sep 17 00:00:00 2001
From: Karsten Dambekalns <karsten@dambekalns.de>
Date: Thu, 13 Jun 2024 10:27:26 +0200
Subject: [PATCH 20/26] TASK: Add benchmark test notes to CONTRIBUTING.md

---
 CONTRIBUTING.md | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index cf65451b640..12cf1d0b493 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -24,7 +24,7 @@ The code of the CMS can then be found inside `Packages/Neos`, which itself is th
 
 In the root directory of the development distribution, you can do the following things:
 
-To run tests, run `./bin/phpunit -c ./Build/BuildEssentials/PhpUnit/UnitTests.xml` for unit tests or `./bin/phpunit -c ./Build/BuildEssentials/PhpUnit/FunctionalTests.xml` for functional/integration tests.
+To run tests, run `composer run test-unit` for unit tests or `composer test-functional` for functional/integration tests.
 
 ---
 
@@ -32,7 +32,7 @@ To run tests, run `./bin/phpunit -c ./Build/BuildEssentials/PhpUnit/UnitTests.xm
 
 We use an upmerging strategy: create all bugfixes to the lowest maintained branch that contains the issue. Typically, this is the second last LTS release - see the diagram at https://www.neos.io/features/release-process.html.
 
-  For new features, pull requests should be made against the branch for the next minor version (named like `x.y`). Breaking changes must only go into the branch for the next major version.
+For new features, pull requests should be made against the branch for the next minor version (named like `x.y`). Breaking changes must only go into the branch for the next major version.
 
 ---
 
@@ -97,6 +97,8 @@ Do the following for setting up everything:
 
 ### Running the Tests
 
+#### Behavioural tests (Behat)
+
 The normal mode is running PHP locally, but running Mariadb / Postgres in containers (so we know
 we use the right versions etc).
 
@@ -123,3 +125,19 @@ FLOW_CONTEXT=Testing/Behat ../../../../../flow raceConditionTracker:reset
 
 FLOW_CONTEXT=Testing/Behat ../../../../../flow raceConditionTracker:analyzeTrace
 ```
+
+#### Benchmark tests
+
+For those you need to install `phive` first, see https://phar.io/#Install, and then run
+
+```shell
+phive install phpbench
+```
+
+to install the needed [PHPBench]([url](https://github.com/phpbench/phpbench)) tool.
+
+Then run
+
+```shell
+composer run benchmark
+```

From 172b09d52dea80d3164a5d89ac22811a89147a3a Mon Sep 17 00:00:00 2001
From: Karsten Dambekalns <karsten@dambekalns.de>
Date: Thu, 13 Jun 2024 13:54:31 +0200
Subject: [PATCH 21/26] TASK: Delete .github/CONTRIBUTING.md
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The content should go into the repository root file of the same name…
---
 .github/CONTRIBUTING.md | 92 -----------------------------------------
 1 file changed, 92 deletions(-)
 delete mode 100644 .github/CONTRIBUTING.md

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
deleted file mode 100644
index 152b505f9e2..00000000000
--- a/.github/CONTRIBUTING.md
+++ /dev/null
@@ -1,92 +0,0 @@
-
-**Neos and Flow are open-source software built by a global community to create an innovative Content Application Platform. Everyone is welcome to contribute to the community and has the possibility to influence the project.**
-
-Please be considerate of our [code of conduct](https://www.neos.io/about/code-of-conduct.html)! We like to provide a positive and enjoyable environment for everybody.
-
-Do you want to get a certain improvement in Neos or Flow? Did you find a problem? Do you want to help translate, promote or document the products?
-
-Become part of the Neos project community and help us build a content management system with a great user experience!
-
-----------
-
-# How to participate
-
-The development of the project is structured in an agile way. You can found more details about the current teams on the official Neos website. You can join one of those team or decide to simply send a single or irregular contributions. All contributions are welcome.
-Our [Code contribution guidline](https://discuss.neos.io/t/code-contribution-guideline/503) might also be helpful to start with.
-
-## You are a design or UX expert?
-
-The Neos project is focused on providing first class UX for our products. Help out with Neos CMS user interaction design or graphic design! Get in touch using our [Design & UX](https://discuss.neos.io/c/creating/design-ux) discussion forum.
-
-## You are a Content Strategist?
-
-We love content, so we try to solve today's (and tomorrows's!) problems in producing, curating and managing content. Input from you as a content strategist help us to reach our goal. Contact us hello@neos.io to see how we can collaborate.
-
-## You are a coder? Backend, frontend or both?
-
-### Our stack
-
-We spend our time on the following tools, you should have a good understanding of this tooling.
-
-- PHP 7.0
-- MySQL / PostgreSQL
-- EmberJS (used for the current UI)
-- React (used for the UI rewrite currently being done)
-- Git
-
-You can find us on [Github](https://github.com/neos) and we use it as our main issue tracker as well.
-
-### Related resources
-
-- [Development setup](https://discuss.neos.io/t/development-setup/504)
-
-## You have skills in marketing, branding or product strategy?
-
-The Neos project is responsible for the Neos brand and we manage two product Neos CMS, our content application platform, and Flow Framework, a modern PHP based framework designed to support Neos or any complex PHP application.
-
-We are currently in the process to create the identity for the Neos brand. If you have skills in this area your are highly welcome, just ping us to have more information on the current status of the branding project.
-
-## You have other skills that you think can be useful for the community?
-
-Who knows, some of your skills are not in this list, but can be really useful for the community. You are a project manager, an event organizer, a brewer, a team builder and yoga trainer and you want to support an open source community, connect with us: **hello@neos.io** 
-
-We certainly have a something that matches your dream job and where you can help the project.
-
-## Test
-
-Your are an end user, enthusiast developer and you have some hours to help the community? Let's see how you can setup Neos, test the product and report issue to the community.
-
-### Our stack
-
-We spend our time on the following tools, you should have a good understanding of this tooling.
-
-- PHPunit (unit and functional testing)
-- Behat (functional testing)
-- GIT 
-
-You can find us on [Github](https://github.com/neos) and we also use it as our main issue tracker.
-
-### Related resources
-
-- *TODO* How to setup your testing environment?
-
-## Translate and document
-
-You can contribute to the translation process, by creating an account at [Crowdin](https://crowdin.com/project/neos).
-
-On a regularly basis we synchronize the translation from Crowdin to our Git repositories (internally XLIFF is used for storing translations). See the [description of the translation process](https://www.neos.io/contribute/translating-neos.html) on our website for details.
-
-## You have some knowledge, try to help other
-
-Answer questions about the products use and development.
-
-- Join our community discussion on [discuss.neos.io](https://discuss.neos.io)
-- Meet us on Slack [slack.neos.io](http://slack.neos.io)
-
-# Support the Neos Project development with bounties
-
-The Neos project is in the process of founding a legal body. Until then it is not possible to directly donate to the Neos project. For the time being Sandstorm Media has therefore agreed with the Neos team to sell Neos supporter badges and use all revenues to support the Neos project. [Check our donations page](https://www.neos.io/contribute/donating-to-neos.html)
-
-# Thanks for helping Neos CMS and Flow Framework
-
-If you have any questions, [we are happy to help you](https://www.neos.io/contact).

From b46fa2e451f9bafa1691a3670c6025defea07449 Mon Sep 17 00:00:00 2001
From: Karsten Dambekalns <karsten@dambekalns.de>
Date: Thu, 13 Jun 2024 14:01:34 +0200
Subject: [PATCH 22/26] TASK: Update CONTRIBUTING.md with "old" content

---
 CONTRIBUTING.md | 108 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 102 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 12cf1d0b493..08e9d639cf9 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,5 +1,101 @@
 # Contributing
 
+**Neos and Flow are open-source software built by a global community to create an innovative Content Application Platform. Everyone is welcome to contribute to the community and has the possibility to influence the project.**
+
+Please be considerate of our [code of conduct](https://www.neos.io/about/code-of-conduct.html)! We like to provide a positive and enjoyable environment for everybody.
+
+Do you want to get a certain improvement in Neos or Flow? Did you find a problem? Do you want to help translate, promote or document the products?
+
+Become part of the Neos project community and help us build a content management system with a great user experience!
+
+----------
+
+## How to participate
+
+The development of the project is structured in an agile way. You can found more details about the current teams on the official Neos website. You can join one of those team or decide to simply send a single or irregular contributions. All contributions are welcome.
+Our [Code contribution guidline](https://discuss.neos.io/t/code-contribution-guideline/503) might also be helpful to start with.
+
+### You are a design or UX expert?
+
+The Neos project is focused on providing first class UX for our products. Help out with Neos CMS user interaction design or graphic design! Get in touch using our [Design & UX](https://discuss.neos.io/c/creating/design-ux) discussion forum.
+
+### You are a Content Strategist?
+
+We love content, so we try to solve today's (and tomorrows's!) problems in producing, curating and managing content. Input from you as a content strategist help us to reach our goal. Contact us hello@neos.io to see how we can collaborate.
+
+### You are a coder? Backend, frontend or both?
+
+#### Our stack
+
+We spend our time on the following tools, you should have a good understanding of this tooling.
+
+- PHP
+- MySQL / PostgreSQL
+- ReactJS
+- Git
+
+You can find us on [GitHub](https://github.com/neos) and we use it as our main issue tracker as well.
+
+#### Related resources
+
+Read on further down!
+
+### You have skills in marketing, branding or product strategy?
+
+The Neos project is responsible for the Neos brand and we manage two product Neos CMS, our content application platform, and Flow Framework, a modern PHP based framework designed to support Neos or any complex PHP application.
+
+We are currently in the process to create the identity for the Neos brand. If you have skills in this area your are highly welcome, just ping us to have more information on the current status of the branding project.
+
+### You have other skills that you think can be useful for the community?
+
+Who knows, some of your skills are not in this list, but can be really useful for the community. You are a project manager, an event organizer, a brewer, a team builder and yoga trainer and you want to support an open source community, connect with us: **hello@neos.io** 
+
+We certainly have a something that matches your dream job and where you can help the project.
+
+### Test
+
+Your are an end user, enthusiast developer and you have some hours to help the community? Let's see how you can setup Neos, test the product and report issue to the community.
+
+
+#### Related resources
+
+Read on further down!
+
+#### Our stack
+
+We spend our time on the following tools, you should have a good understanding of this tooling.
+
+- PHPunit (unit and functional testing)
+- Behat (functional testing)
+- GIT 
+
+You can find us on [Github](https://github.com/neos) and we also use it as our main issue tracker.
+
+### Translate and document
+
+You can contribute to the translation process, by creating an account at [Crowdin](https://crowdin.com/project/neos).
+
+On a regularly basis we synchronize the translation from Crowdin to our Git repositories (internally XLIFF is used for storing translations). See the [description of the translation process](https://www.neos.io/contribute/translating-neos.html) on our website for details.
+
+### You have some knowledge, try to help others
+
+Answer questions about the products use and development.
+
+- Join our community discussion on [discuss.neos.io](https://discuss.neos.io)
+- Meet us on Slack [slack.neos.io](http://slack.neos.io)
+
+### Support the Neos Project development with bounties
+
+The Neos project is in the process of founding a legal body. Until then it is not possible to directly donate to the Neos project. For the time being Sandstorm Media has therefore agreed with the Neos team to sell Neos supporter badges and use all revenues to support the Neos project. [Check our donations page](https://www.neos.io/contribute/donating-to-neos.html)
+
+## Thanks for helping Neos CMS and Flow Framework
+
+If you have any questions, [we are happy to help you](https://www.neos.io/contact).
+
+---
+
+## Details on development and testing
+
 **For (specific) Notes on Neos 9, see further down…**
 
 If you want to contribute to Neos and want to set up a development environment, then follow these steps:
@@ -41,15 +137,15 @@ https://discuss.neos.io/t/creating-a-pull-request/506 and
 https://discuss.neos.io/t/git-branch-handling-in-the-neos-project/6013
 
 
-## Neos 9
+### Neos 9
 
 
-### Prerequisites
+#### Prerequisites
 
 - You need PHP 8.2 installed.
 - Please be sure to run off the Neos development distribution in branch 9.0, to avoid dependency issues.
 
-### Setup
+#### Setup
 
 The Event-Sourced Content Repository has a Docker Compose file included in `Neos.ContentRepository.BehavioralTests` which starts both Mariadb and Postgres in compatible versions. Additionally, there exists a helper to change the configuration in your distribution (`/Configuration`) to the correct values matching this database.
 
@@ -95,9 +191,9 @@ Do the following for setting up everything:
    popd
    ```
 
-### Running the Tests
+#### Running the Tests
 
-#### Behavioural tests (Behat)
+##### Behavioural tests (Behat)
 
 The normal mode is running PHP locally, but running Mariadb / Postgres in containers (so we know
 we use the right versions etc).
@@ -126,7 +222,7 @@ FLOW_CONTEXT=Testing/Behat ../../../../../flow raceConditionTracker:reset
 FLOW_CONTEXT=Testing/Behat ../../../../../flow raceConditionTracker:analyzeTrace
 ```
 
-#### Benchmark tests
+##### Benchmark tests
 
 For those you need to install `phive` first, see https://phar.io/#Install, and then run
 

From ef7b279e509ca6ac8d2986a79154177db3828a2f Mon Sep 17 00:00:00 2001
From: Hosted Weblate <hosted@weblate.org>
Date: Fri, 14 Jun 2024 10:14:56 +0200
Subject: [PATCH 23/26] TASK: Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Translate-URL: https://hosted.weblate.org/projects/neos/neosneos-modules-90/
Translation: Neos/Neos.Neos - Modules - 9.0
---
 .../Private/Translations/ar/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/cs/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/da/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/de/Modules.xlf       |  36 --
 .../Private/Translations/el/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/es/Modules.xlf       |  36 --
 .../Private/Translations/fi/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/fr/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/hu/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/id_ID/Modules.xlf    | 504 ++++++++---------
 .../Private/Translations/it/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/ja/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/km/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/lv/Modules.xlf       | 506 ++++++++----------
 .../Private/Translations/nl/Modules.xlf       |  36 --
 .../Private/Translations/no/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/pl/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/pt/Modules.xlf       |  36 --
 .../Private/Translations/pt_BR/Modules.xlf    | 504 ++++++++---------
 .../Private/Translations/ru/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/sr/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/sv/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/tl_PH/Modules.xlf    | 504 ++++++++---------
 .../Private/Translations/tr/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/uk/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/vi/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/zh/Modules.xlf       | 504 ++++++++---------
 .../Private/Translations/zh_TW/Modules.xlf    | 504 ++++++++---------
 28 files changed, 5617 insertions(+), 6625 deletions(-)

diff --git a/Neos.Neos/Resources/Private/Translations/ar/Modules.xlf b/Neos.Neos/Resources/Private/Translations/ar/Modules.xlf
index 86e0fa219b5..c275c51a029 100644
--- a/Neos.Neos/Resources/Private/Translations/ar/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/ar/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="ar">
     <body>
       <trans-unit id="back" xml:space="preserve">
-				<source>Back</source>
+        <source>Back</source>
         <target state="translated">رجوع</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">إلغاء</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="translated">الإدارة</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="translated">يحتوي على وحدات متعددة تتعلق بإدارة المحتوى</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="translated">الإدارة</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="translated">يحتوي على عدة وحدات تتعلق بإدارة المحتوى</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="translated">إدارة المستخدم</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="translated">الوحدة النمطية "إدارة المستخدم" توفر لك نظرة عامة لكافة المستخدمين. يمكنك أن تجمع لهم مجموعة من الخصائص الخاصة حتى تتمكن من رصد الأذونات الخاصة بهم، فيليمونتس، مجموعات الأعضاء إلخ... هذه الوحدة أداة لا غنى عنها من أجل التأكد من أنه تم ضبط إعدادات المستخدمين بشكل صحيح.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="translated">نظرة عامة</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="translated">عرض</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="translated">جديد</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">عدل</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">تعديل الحساب</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">عنوان إلكتروني جديد</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">استخدام الإعدادات الافتراضية</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">إنشاء مستخدم</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="translated">إنشاء مستخدم جديد</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">بيانات المستخدم</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">اسم المستخدم</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">كلمة السر</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">قم بإعادة كتابة كلمة السر</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="translated">الصلاحيات</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="needs-translation">Authentication Provider</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">استخدام الإعدادات الافتراضية</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">البيانات الشخصية</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">الإسم الأول</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">اسم العائلة</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">المفضلة عند المستخدم</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">لغة الواجهة</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">إنشاء مستخدم</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="translated">تفاصيل المستخدم</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">البيانات الشخصية</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">العنوان</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">الإسم الأول</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="translated">الإسم الأوسط</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">اسم العائلة</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="translated">اسم آخر</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">الحسابات</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">اسم المستخدم</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">الأدوار</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="translated">البريد الإلكتروني</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="translated">الرئيسي</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="translated">غير متوفر</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="translated">حذف المستخدم</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">تعديل المستخدم</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">تم تسجيل الدخولك بهذا مستخدم ولا يمكنك حذف نفسك.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="translated">انقر هنا لحذف هذا المستخدم</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">هل تريد حقاً حذف المستخدم "{0}" ؟</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">نعم، إحذف المستخدم</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">سيؤدي هذا إلى حذف المستخدم والحسابات ذات الصلة به و مساحة العمل الشخصية، بما في ذلك كل المحتوى الغير منشور.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="translated">لا يمكن التراجع عن هذا الإجراء</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="translated">تحرير الحساب "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="translated">الحساب</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">اسم المستخدم</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="translated">لا يمكن تغيير اسم المستخدم عن طريق واجهة المستخدم</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="translated">حفظ الحساب</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">قم بإعادة كتابة كلمة السر</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">الأدوار</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">الاسم</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="translated">الحسابات والأدوار</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="translated">عرض المستخدم</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="translated">تعديل المستخدم</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="translated">حذف المستخدم</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">تم تسجيل الدخولك بهذا مستخدم ولا يمكنك حذف نفسك.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">هل تريد حقاً حذف المستخدم "{0}" ؟</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">سيؤدي هذا إلى حذف المستخدم والحسابات ذات الصلة به و مساحة العمل الشخصية، بما في ذلك كل المحتوى الغير منشور.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">نعم، إحذف المستخدم</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="translated">تعديل المستخدم "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="translated">الصفحة الرئيسية</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="translated">المهنة</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="translated">إدارة الحزمة</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="translated">وحدة "إدارة حزمة" يوفر لك نظرة عامة لكافة الحزم. يمكنك تنشيط وإلغاء تنشيط مجموعات فردية، قم باستيراد حزم جديدة وحذف الحزم الموجودة. كما أنه يوفر لك القدرة على تجميدها وإلغاء تجميدها في سياق التنمية.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="translated">الحزم المتوفرة</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="translated">اسم الحزمة</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="translated">مفتاح الحزمة</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="translated">نوع الحزمة</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="translated">غير مفعلة</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="translated">هذه الحزمة هي مجمدة حاليا. انقر فوق لإلغاء تجميدها.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="translated">تجميد الحزمة من أجل الإسراع في موقع الويب الخاص بك.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="translated">هذه الحزمة محمية ولا يمكن تجميدها.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="translated">تجميد الحزمة</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="translated">تنشيط الحزمة</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="translated">هذه الحزمة محمي ولا يمكن حذفها.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="translated">حذف الحزمة</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="translated">هل تريد حقاً حذف "{0}"؟</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="translated">نعم، إحذف الحزمة</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="needs-translation">Yes, delete the packages</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="needs-translation">Do you really want to delete the selected packages?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="needs-translation">Freeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="needs-translation">Unfreeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="needs-translation">Delete selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="needs-translation">Deactivate selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="needs-translation">Activate selected packages</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="needs-translation">Sites Management</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="needs-translation">The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="translated">إضافة موقع جديد</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="needs-translation">Create site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="needs-translation">Create a new site</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="translated">اسم عقدة الجذر</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="translated">نطاقات</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="translated">موقع</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">الاسم</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="translated">مجموعة الأصول الافتراضية</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="translated">حزمة الموقع</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="translated">احذف هذا الموقع</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="translated">إلغاء تفعيل الموقع</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="translated">تفعيل الموقع</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">هل تريد حقاً حذف "{0}"؟ هذا الأمر لا يمكن التراجع عنه.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="translated">نعم, احذف هذا الموقع</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="translated">استيراد موقع</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="translated">اختر حزمة موقع</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="translated">لا توجد حزمة موقع متاحة. تأكد بأن لديك حزمة موقع مفعلة.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="translated">انشئ موقع فارغ</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="translated">حدد وثيقة نوع العقدة</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="translated">اسم الموقع</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="translated">انشئ موقع فارغ</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="translated">انشئ حزمة موقع جديدة</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="needs-translation">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="translated">لا مواقع متاحة</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The <em>Neos Kickstarter</em> package is not installed, install it to kickstart new sites.</source>
-        <target state="needs-translation">The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="translated">موقع جديد</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">هل تريد حقاً حذف "{0}"؟ هذا الأمر لا يمكن التراجع عنه.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="translated">نطاق جديد</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="translated">تعديل نطاق</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="translated">بيانات المجال</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="translated">مثل www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="translated">حالة</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="translated">انشئ</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="needs-translation">Configuration</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="needs-translation">The Configuration module provides you with an overview of all configuration types.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="translated">الأبعاد</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="needs-translation">Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="needs-translation">Inter dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="needs-translation">Inter dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="needs-translation">The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
@@ -569,416 +553,396 @@ Primary fallbacks are marked blue and always visible, while lower priority fallb
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="needs-translation">Intra dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="needs-translation">Intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="needs-translation">The intra dimensional fallback graph displays fallbacks within each content dimension.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="needs-translation">User</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="needs-translation">User Settings</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="needs-translation">This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">عدل</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">عدل</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">عنوان إلكتروني جديد</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">تعديل الحساب</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">البيانات الشخصية</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">بيانات المستخدم</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="needs-translation">User Menu</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">المفضلة عند المستخدم</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">لغة الواجهة</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">استخدام الإعدادات الافتراضية</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">الحسابات</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">اسم المستخدم</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">الأدوار</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="needs-translation">Authentication Provider</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="needs-translation">Electronic addresses</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="needs-translation">Do you really want to delete</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="needs-translation">Yes, delete electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="needs-translation">Click to add a new Electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="needs-translation">Add electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="translated">حفظ المستخدم</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">تعديل المستخدم</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">تحديث</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">تعديل المستخدم</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/cs/Modules.xlf b/Neos.Neos/Resources/Private/Translations/cs/Modules.xlf
index d1ea9be6615..29a2e24fdac 100644
--- a/Neos.Neos/Resources/Private/Translations/cs/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/cs/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="cs">
     <body>
       <trans-unit id="back" xml:space="preserve">
-				<source>Back</source>
+        <source>Back</source>
         <target state="needs-translation">Back</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">Zrušit</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="translated">Správa</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="translated">Obsahuje moduly pro správu obsahu</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="translated">Administrace</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="needs-translation">Contains multiple modules related to administration</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="translated">Správa uživatelů</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="translated">Modul Správa uživatelů poskytuje přehled všech uživatelů. Můžete je seskupit podle jejich vlastností, takže budete moci sledovat jejich oprávnění, soubory, členství ve skupinách atd… Tento modul je nepostradatelným nástrojem pro kontrolu, že jsou uživatelské účty správně nakonfigurovány.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="needs-translation">Overview</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="needs-translation">Show</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="needs-translation">New</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Editovat</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="needs-translation">Edit account</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="needs-translation">New electronic address</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Použít výchozí nastavení systému</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="needs-translation">Create user</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="needs-translation">Create a new user</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="needs-translation">User Data</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Uživatelské jméno</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">Heslo</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Opakovat heslo</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="needs-translation">Role(s)</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="needs-translation">Authentication Provider</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Použít výchozí nastavení systému</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="needs-translation">Personal Data</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Křestní Jméno</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Příjmení</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="needs-translation">User Preferences</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="needs-translation">Interface Language</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="needs-translation">Create user</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="needs-translation">Details for user</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="needs-translation">Personal Data</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">Titul</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Křestní Jméno</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="translated">Prostřední jméno</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Příjmení</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="translated">Jiné jméno</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="needs-translation">Accounts</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Uživatelské jméno</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="needs-translation">Electronic Addresses</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="translated">Výchozí</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="needs-translation">N/A</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="needs-translation">Delete User</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="needs-translation">Edit User</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="needs-translation">You are logged in as this user and you cannot delete yourself.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="needs-translation">Click here to delete this user</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="needs-translation">Do you really want to delete the user "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="needs-translation">Yes, delete the user</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="needs-translation">This will delete the user, the related accounts and his personal workspace, including all unpublished content.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="needs-translation">This operation cannot be undone</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="translated">Upravit účet "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="translated">Účet</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Uživatelské jméno</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="translated">Uživatelské jméno nelze změnit prostřednictvím uživatelského rozhraní</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="translated">Uložit účet</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Opakovat heslo</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="needs-translation">Name</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="needs-translation">Accounts and Roles</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="needs-translation">View user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="needs-translation">Edit user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="needs-translation">Delete user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="needs-translation">You are logged in as this user and you cannot delete yourself.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="needs-translation">Do you really want to delete the user "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="needs-translation">This will delete the user, the related accounts and his personal workspace, including all unpublished content.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="needs-translation">Yes, delete the user</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="needs-translation">Edit user "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="needs-translation">Home</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="needs-translation">Work</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="translated">Správa balíčků</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="needs-translation">The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="needs-translation">Available packages</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="needs-translation">Package Name</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="needs-translation">Package Key</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="needs-translation">Package Type</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="needs-translation">Deactivated</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="needs-translation">This package is currently frozen. Click to unfreeze it.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="needs-translation">Freeze the package in order to speed up your website.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="needs-translation">This package is protected and cannot be deactivated.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="needs-translation">Deactivate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="needs-translation">Activate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="needs-translation">This package is protected and cannot be deleted.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="needs-translation">Delete Package</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="needs-translation">Do you really want to delete "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="needs-translation">Yes, delete the package</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="needs-translation">Yes, delete the packages</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="needs-translation">Do you really want to delete the selected packages?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="needs-translation">Freeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="needs-translation">Unfreeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="needs-translation">Delete selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="needs-translation">Deactivate selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="needs-translation">Activate selected packages</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="translated">Správa webů</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="needs-translation">The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="translated">Přidat novou stránku</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="needs-translation">Create site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="needs-translation">Create a new site</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="needs-translation">Root node name</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="translated">Domény</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="needs-translation">Site</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="needs-translation">Name</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="needs-translation">Default asset collection</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="needs-translation">Site package</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="translated">Odstranit tuto stránku</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="translated">Deaktivovat stránku</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="translated">Aktivovat stránku</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Opravdu chcete odtranit "{0}"? Tuto akci nelze vrátit zpět.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="translated">Ano, odstranit stránku</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="translated">Importovat stránku</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="needs-translation">Select a site package</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="needs-translation">No site packages are available. Make sure you have an active site package.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="translated">Vytvořit prázdnou stránku</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="needs-translation">Select a document nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="translated">Název stránky</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="translated">Vytvořit prázdnou stránku</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="needs-translation">Create a new site package</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="needs-translation">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="needs-translation">No sites available</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The <em>Neos Kickstarter</em> package is not installed, install it to kickstart new sites.</source>
-        <target state="needs-translation">The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="needs-translation">New site</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Opravdu chcete odtranit "{0}"? Tuto akci nelze vrátit zpět.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="translated">Nová doména</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="translated">Upravit doménu</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="needs-translation">Domain data</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="needs-translation">e.g. www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="needs-translation">State</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="needs-translation">Create</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="needs-translation">Configuration</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="needs-translation">The Configuration module provides you with an overview of all configuration types.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="needs-translation">Dimensions</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="needs-translation">Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="needs-translation">Inter dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="needs-translation">Inter dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="needs-translation">The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
@@ -569,416 +553,396 @@ Primary fallbacks are marked blue and always visible, while lower priority fallb
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="needs-translation">Intra dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="needs-translation">Intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="needs-translation">The intra dimensional fallback graph displays fallbacks within each content dimension.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="translated">Uživatel</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="needs-translation">User Settings</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="needs-translation">This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Editovat</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Editovat</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="needs-translation">New electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="needs-translation">Edit account</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="needs-translation">Personal Data</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="needs-translation">User Data</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="needs-translation">User Menu</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="needs-translation">User Preferences</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="needs-translation">Interface Language</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Použít výchozí nastavení systému</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="needs-translation">Accounts</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Uživatelské jméno</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="needs-translation">Authentication Provider</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="needs-translation">Electronic addresses</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="needs-translation">Do you really want to delete</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="needs-translation">Yes, delete electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="needs-translation">Click to add a new Electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="needs-translation">Add electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="needs-translation">Save User</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="needs-translation">Edit User</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">Aktualizovat</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="needs-translation">Edit User</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/da/Modules.xlf b/Neos.Neos/Resources/Private/Translations/da/Modules.xlf
index 0e9cc6b4ec2..5db39bdcc16 100644
--- a/Neos.Neos/Resources/Private/Translations/da/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/da/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="da">
     <body>
       <trans-unit id="back" xml:space="preserve" approved="yes">
-				<source>Back</source>
+        <source>Back</source>
         <target state="final">Tilbage</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve" approved="yes">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="final">Annullér</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve" approved="yes">
-				<source>Management</source>
+        <source>Management</source>
         <target state="final">Management</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve" approved="yes">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="final">Indeholder flere moduler relateret til administration af indhold</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve" approved="yes">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="final">Administration</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve" approved="yes">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="final">Indeholder flere moduler relateret til administration</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve" approved="yes">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="final">Brugeradministration</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve" approved="yes">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="final">Brugeradministrationsmodulet giver dig et overblik over alle backend-brugere. Du kan gruppere dem efter deres egenskaber, så du er i stand til at holde øje med deres tilladelser, filemounts, grupper, mv. Dette modul er et uundværligt værktøj til at sikre, at brugerne er sat korrekt op.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve" approved="yes">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="final">Oversigt</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve" approved="yes">
-				<source>Show</source>
+        <source>Show</source>
         <target state="final">Vis</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve" approved="yes">
-				<source>New</source>
+        <source>New</source>
         <target state="final">Ny</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Redigér</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve" approved="yes">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="final">Rediger konto</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve" approved="yes">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="final">Ny elektronisk adresse</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Brug systemets standard</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve" approved="yes">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="final">Opret bruger</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve" approved="yes">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="final">Opret ny bruger</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve" approved="yes">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="final">Brugerinformation</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Brugernavn</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve" approved="yes">
-				<source>Password</source>
+        <source>Password</source>
         <target state="final">Adgangskode</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve" approved="yes">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="final">Gentag kodeord</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve" approved="yes">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="final">Rolle(r)</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve" approved="yes">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="final">Autentificeringstjeneste</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Brug systemets standard</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Personlig information</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve" approved="yes">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="final">Fornavn</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve" approved="yes">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="final">Efternavn</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve" approved="yes">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="final">Brugerindstillinger</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="final">Systemsprog</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve" approved="yes">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="final">Opret bruger</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve" approved="yes">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="final">Brugerdetaljer</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Personlig information</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve" approved="yes">
-				<source>Title</source>
+        <source>Title</source>
         <target state="final">Titel</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve" approved="yes">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="final">Fornavn</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve" approved="yes">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="final">Mellemnavn</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve" approved="yes">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="final">Efternavn</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve" approved="yes">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="final">Andet navn</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve" approved="yes">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="final">Konti</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Brugernavn</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Roller</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve" approved="yes">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="final">Elektroniskeadresser</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve" approved="yes">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="final">Primær</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve" approved="yes">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="final">Ikke til rådighed</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve" approved="yes">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="final">Slet bruger</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Rediger bruger</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve" approved="yes">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="final">Du er logget ind som denne bruger og du kan ikke slette dig selv.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve" approved="yes">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="final">Klik her for at slette denne bruger</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="final">Vil du slette brugeren "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve" approved="yes">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="final">Ja, slet brugeren</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve" approved="yes">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="final">Dette sletter brugeren, de relaterede konti og personlige arbejdsrum, herunder alt ikke-publiceret indhold.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve" approved="yes">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="final">Denne handling kan ikke fortrydes</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve" approved="yes">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="final">Rediger konto "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve" approved="yes">
-				<source>Account</source>
+        <source>Account</source>
         <target state="final">Konto</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Brugernavn</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve" approved="yes">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="final">Brugernavnet kan ikke ændres via brugergrænsefladen</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve" approved="yes">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="final">Gem konto</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve" approved="yes">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="final">Gentag kodeord</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Roller</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve" approved="yes">
-				<source>Name</source>
+        <source>Name</source>
         <target state="final">Navn</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve" approved="yes">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="final">Konti og roller</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve" approved="yes">
-				<source>View user</source>
+        <source>View user</source>
         <target state="final">Vis bruger</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve" approved="yes">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="final">Rediger bruger</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve" approved="yes">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="final">Slet bruger</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve" approved="yes">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="final">Du er logget ind som denne bruger og du kan ikke slette dig selv.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="final">Vil du slette brugeren "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve" approved="yes">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="final">Dette sletter brugeren, de relaterede konti og personlige arbejdsrum, herunder alt ikke-publiceret indhold.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve" approved="yes">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="final">Ja, slet brugeren</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve" approved="yes">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="final">Rediger bruger "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve" approved="yes">
-				<source>Home</source>
+        <source>Home</source>
         <target state="final">Hjem</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve" approved="yes">
-				<source>Work</source>
+        <source>Work</source>
         <target state="final">Arbejde</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve" approved="yes">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="final">Pakkehåndtering</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve" approved="yes">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="final">Pakkehåndteringsmodulet giver dig et overblik over alle pakker. Du kan aktivere og deaktivere individuelle pakker, importere nye pakker og slette eksisterende pakker. Det giver dig også mulighed for at fastlåse og frigøre pakker i udviklingssammenhæng.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve" approved="yes">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="final">Tilgængelige pakker</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve" approved="yes">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="final">Pakkenavn</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve" approved="yes">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="final">Pakkenøgle</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve" approved="yes">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="final">Pakketype</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve" approved="yes">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="final">Deaktiveret</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve" approved="yes">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="final">Denne pakke er i øjeblikket låst. Klik for at frigive den.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve" approved="yes">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="final">Lås pakken for at optimere din hjemmeside.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve" approved="yes">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="final">Denne pakke er beskyttet og kan ikke deaktiveres.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve" approved="yes">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="final">Deaktivér pakke</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve" approved="yes">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="final">Aktivér pakke</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve" approved="yes">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="final">Denne pakke er beskyttet og kan ikke slettes.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve" approved="yes">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="final">Slet pakke</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="final">Vil du slette "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve" approved="yes">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="final">Ja, slet pakken</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve" approved="yes">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="final">Ja, slet pakkerne</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="final">Vil du slette de valgte pakker?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve" approved="yes">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="final">Lås valgte pakker</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve" approved="yes">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="final">Frigør valgte pakker</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve" approved="yes">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="final">Slet valgte pakker</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve" approved="yes">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="final">Deaktivér valgte pakker</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve" approved="yes">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="final">Aktivér valgte pakker</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve" approved="yes">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="final">Administration af websteder</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve" approved="yes">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="final">Websteds administrationsmodulet giver dig en oversigt over alle websteder. Du kan redigere, tilføje og slette information om dine websteder, så som at tilføje et nyt domæne.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="translated">Tilføj nyt websted</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve" approved="yes">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="final">Opret websted</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve" approved="yes">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="final">Opret et nyt websted</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="translated">Rod node navn</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="translated">Domæner</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve" approved="yes">
-				<source>Site</source>
+        <source>Site</source>
         <target state="final">Webside</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve" approved="yes">
-				<source>Name</source>
+        <source>Name</source>
         <target state="final">Navn</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="translated">Standard filkollektion</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="translated">Websted pakke</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="translated">Slet dette websted</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="translated">Deaktiver websted</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="translated">Aktiver websted</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Vil du slette "{0}"? Dette kan ikke fortrydes.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="translated">Ja, slet dette websted</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="translated">Importer et websted</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="translated">Vælg en webstedspakke</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="translated">Ingen websteder tilgængelig. Vær sikker på du har en aktiv webstedspakke.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="translated">Opret et blankt websted</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="translated">Vælg dokumenttype</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="translated">Websted navn</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="translated">Opret tomt websted</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="translated">Opret ny webstedspakke</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="translated">EjerNavn.MinPakkeNøgle</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="translated">Ingen sider tilgængelig</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-        <target state="translated">&lt;em&gt;Neos Kickstarter&lt;/em&gt; pakken er ikke installeret, installer for at kunne generere nye websteder.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="translated">Ny side</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Vil du slette "{0}"? Dette kan ikke fortrydes.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="translated">Nyt domæne</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="translated">Rediger domæne</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="translated">Domæne data</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="translated">f.eks. www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="translated">Status</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="translated">Opret</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve" approved="yes">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="final">Konfiguration</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve" approved="yes">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="final">Konfigurationsmodulet giver dig et overblik over alle konfiguration typer.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve" approved="yes">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="final">Dimensioner</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="translated">Giver et grafisk overblik over de konfigurerede tilbagefald indenfor hver indholdsdimension samt på tværs af indholdsdimensioner.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="translated">Flerdimensionel tilbagefaldsgraf</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="translated">Flerdimensionel</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="translated">Den interdimentionelle graf viser all mulige tilbagefald (vist som kanter) mellem undergrafer (indholdsdimensions værdikombinationer, vist som noder).
@@ -569,416 +553,396 @@ Primære tilbagefald er markeret med blå og er altid synlige, mens mindre prior
 Klik på en af noderne for kun at se dens tilbagefald og varianter. Klik igen for at fjerne filteret.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="translated">Intradimentionel tilbagefaldsgraf</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="translated">Intradimentionel</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="translated">Den intradimentionelle graf viser tilbagefalds indenfor hver indholdsdimension.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve" approved="yes">
-				<source>User</source>
+        <source>User</source>
         <target state="final">Bruger</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve" approved="yes">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="final">Brugerindstillinger</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve" approved="yes">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="final">Dette modul giver dig mulighed for at tilpasse din backend brugerprofil. Her kan du ændre det aktive systemsprog, dit navn og din e-mail adresse. Du kan også indstille andre funktionaliteter i systemet.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Redigér</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Redigér</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve" approved="yes">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="final">Ny elektronisk adresse</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve" approved="yes">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="final">Rediger konto</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Personlig information</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve" approved="yes">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="final">Brugerinformation</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve" approved="yes">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="final">Brugermenu</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve" approved="yes">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="final">Brugerindstillinger</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="final">Systemsprog</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Brug systemets standard</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve" approved="yes">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="final">Konti</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Brugernavn</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Roller</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve" approved="yes">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="final">Autentificeringstjeneste</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve" approved="yes">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="final">Elektroniske adresser</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="final">Er du sikker på, at du vil slette</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve" approved="yes">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="final">Ja, slet den elektroniske adresse</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve" approved="yes">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="final">Klik for at tilføje en ny elektronisk adresse</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve" approved="yes">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="final">Tilføj elektronisk adresse</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve" approved="yes">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="final">Gem bruger</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Rediger bruger</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve" approved="yes">
-				<source>Update</source>
+        <source>Update</source>
         <target state="final">Opdater</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Rediger bruger</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/de/Modules.xlf b/Neos.Neos/Resources/Private/Translations/de/Modules.xlf
index 99886860320..91645cec14f 100644
--- a/Neos.Neos/Resources/Private/Translations/de/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/de/Modules.xlf
@@ -476,10 +476,6 @@
         <source>Select a document nodeType</source>
         <target state="final">Wählen Sie einen Dokument-Knotentyp</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-        <source>Select a site generator</source>
-        <target state="translated">Site-Generator auswählen</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve" approved="yes">
         <source>Site name</source>
         <target state="final">Seitenname</target>
@@ -488,22 +484,10 @@
         <source>Create empty site</source>
         <target state="final">Leere Seite erstellen</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve" approved="yes">
-        <source>Create a new site package</source>
-        <target state="final">Ein neues Seitenpaket erstellen</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve" approved="yes">
-        <source>VendorName.MyPackageKey</source>
-        <target state="final">Herstellername.MeinPaketschlüssel</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve" approved="yes">
         <source>No sites available</source>
         <target state="final">Keine Seiten verfügbar</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve" approved="no">
-        <source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-        <target state="translated">Das &lt;em&gt;Neos Kickstarter&lt;/em&gt;-Paket ist nicht installiert, installieren Sie es, um eine neue Seite zu erstellen.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve" approved="yes">
         <source>New site</source>
         <target state="final">Neue Seite</target>
@@ -705,26 +689,6 @@ Klicken Sie auf einen der Knoten um nur die Fallbacks und Varianten für diesen
         <source>The site "{0}" has been updated.</source>
         <target state="final">Die Seite "{0}" wurde aktualisiert.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-        <source>Missing Package</source>
-        <target state="translated">Fehlendes Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-        <source>The package "{0}" is required to create new site packages.</source>
-        <target state="translated">Das Package "{0}" wird zum Erzeugen neuer Site-Packages benötigt.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-        <source>Invalid package key</source>
-        <target state="translated">Ungültiger Package-Key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-        <source>The package key "{0}" already exists.</source>
-        <target state="translated">Der Paketschlüssel "{0}" existiert bereits.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-        <source>Site package {0} was created.</source>
-        <target state="translated">Seitenpaket {0} wurde erstellt.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
         <source>The site has been imported.</source>
         <target state="final">Die Seite wurde importiert.</target>
diff --git a/Neos.Neos/Resources/Private/Translations/el/Modules.xlf b/Neos.Neos/Resources/Private/Translations/el/Modules.xlf
index 25c8c06f1b0..f83a546983a 100644
--- a/Neos.Neos/Resources/Private/Translations/el/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/el/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="el">
     <body>
       <trans-unit id="back" xml:space="preserve">
-				<source>Back</source>
+        <source>Back</source>
         <target state="translated">Επιστροφή</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">Άκυρο</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="translated">Διαχείριση</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="needs-translation">Contains multiple modules related to management of content</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="needs-translation">Administration</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="needs-translation">Contains multiple modules related to administration</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="needs-translation">User Management</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="needs-translation">The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="needs-translation">Overview</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="needs-translation">Show</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="needs-translation">New</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Επεξεργασία</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="needs-translation">Edit account</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="needs-translation">New electronic address</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="needs-translation">Use system default</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="needs-translation">Create user</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="needs-translation">Create a new user</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="needs-translation">User Data</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="needs-translation">Username</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">Κωδικός</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="needs-translation">Repeat password</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="needs-translation">Role(s)</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="needs-translation">Authentication Provider</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="needs-translation">Use system default</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="needs-translation">Personal Data</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Όνομα</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Επώνυμο</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="needs-translation">User Preferences</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="needs-translation">Interface Language</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="needs-translation">Create user</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="needs-translation">Details for user</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="needs-translation">Personal Data</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">Τίτλος</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Όνομα</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="translated">Μεσαίο όνομα</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Επώνυμο</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="translated">Άλλο όνομα</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="needs-translation">Accounts</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="needs-translation">Username</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="needs-translation">Electronic Addresses</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="translated">Κύριο</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="needs-translation">N/A</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="needs-translation">Delete User</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="needs-translation">Edit User</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="needs-translation">You are logged in as this user and you cannot delete yourself.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="needs-translation">Click here to delete this user</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="needs-translation">Do you really want to delete the user "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="needs-translation">Yes, delete the user</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="needs-translation">This will delete the user, the related accounts and his personal workspace, including all unpublished content.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="needs-translation">This operation cannot be undone</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="needs-translation">Edit account "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="needs-translation">Account</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="needs-translation">Username</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="needs-translation">The username can't be changed via the user interface</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="needs-translation">Save account</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="needs-translation">Repeat password</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="needs-translation">Name</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="needs-translation">Accounts and Roles</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="needs-translation">View user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="needs-translation">Edit user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="needs-translation">Delete user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="needs-translation">You are logged in as this user and you cannot delete yourself.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="needs-translation">Do you really want to delete the user "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="needs-translation">This will delete the user, the related accounts and his personal workspace, including all unpublished content.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="needs-translation">Yes, delete the user</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="needs-translation">Edit user "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="needs-translation">Home</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="needs-translation">Work</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="needs-translation">Package Management</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="needs-translation">The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="needs-translation">Available packages</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="needs-translation">Package Name</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="needs-translation">Package Key</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="needs-translation">Package Type</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="needs-translation">Deactivated</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="needs-translation">This package is currently frozen. Click to unfreeze it.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="needs-translation">Freeze the package in order to speed up your website.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="needs-translation">This package is protected and cannot be deactivated.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="needs-translation">Deactivate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="needs-translation">Activate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="needs-translation">This package is protected and cannot be deleted.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="needs-translation">Delete Package</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="needs-translation">Do you really want to delete "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="needs-translation">Yes, delete the package</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="needs-translation">Yes, delete the packages</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="needs-translation">Do you really want to delete the selected packages?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="needs-translation">Freeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="needs-translation">Unfreeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="needs-translation">Delete selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="needs-translation">Deactivate selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="needs-translation">Activate selected packages</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="needs-translation">Sites Management</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="needs-translation">The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="needs-translation">Add new site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="needs-translation">Create site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="needs-translation">Create a new site</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="needs-translation">Root node name</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="needs-translation">Domains</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="needs-translation">Site</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="needs-translation">Name</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="needs-translation">Default asset collection</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="needs-translation">Site package</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="needs-translation">Delete this site</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="needs-translation">Deactivate site</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="needs-translation">Activate site</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="needs-translation">Yes, delete the site</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="needs-translation">Import a site</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="needs-translation">Select a site package</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="needs-translation">No site packages are available. Make sure you have an active site package.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="needs-translation">Create a blank site</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="needs-translation">Select a document nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="needs-translation">Site name</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="needs-translation">Create empty site</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="needs-translation">Create a new site package</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="needs-translation">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="needs-translation">No sites available</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The <em>Neos Kickstarter</em> package is not installed, install it to kickstart new sites.</source>
-        <target state="needs-translation">The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="needs-translation">New site</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="needs-translation">New domain</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="needs-translation">Edit domain</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="needs-translation">Domain data</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="needs-translation">e.g. www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="needs-translation">State</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="needs-translation">Create</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="needs-translation">Configuration</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="needs-translation">The Configuration module provides you with an overview of all configuration types.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="needs-translation">Dimensions</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="needs-translation">Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="needs-translation">Inter dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="needs-translation">Inter dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="needs-translation">The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
@@ -569,416 +553,396 @@ Primary fallbacks are marked blue and always visible, while lower priority fallb
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="needs-translation">Intra dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="needs-translation">Intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="needs-translation">The intra dimensional fallback graph displays fallbacks within each content dimension.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="needs-translation">User</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="needs-translation">User Settings</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="needs-translation">This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Επεξεργασία</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Επεξεργασία</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="needs-translation">New electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="needs-translation">Edit account</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="needs-translation">Personal Data</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="needs-translation">User Data</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="needs-translation">User Menu</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="needs-translation">User Preferences</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="needs-translation">Interface Language</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="needs-translation">Use system default</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="needs-translation">Accounts</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="needs-translation">Username</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="needs-translation">Authentication Provider</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="needs-translation">Electronic addresses</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="needs-translation">Do you really want to delete</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="needs-translation">Yes, delete electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="needs-translation">Click to add a new Electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="needs-translation">Add electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="needs-translation">Save User</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="needs-translation">Edit User</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">Ενημέρωση</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="needs-translation">Edit User</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/es/Modules.xlf b/Neos.Neos/Resources/Private/Translations/es/Modules.xlf
index 6fc2b3f1a4d..0be7f1b455a 100644
--- a/Neos.Neos/Resources/Private/Translations/es/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/es/Modules.xlf
@@ -476,10 +476,6 @@
         <source>Select a document nodeType</source>
         <target state="final">Selecciona el tipo de documento nodoTipo</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-        <source>Select a site generator</source>
-        <target state="translated">Seleccione un generador de sitios</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve" approved="yes">
         <source>Site name</source>
         <target state="final">Nombre del sitio</target>
@@ -488,22 +484,10 @@
         <source>Create empty site</source>
         <target state="final">Crear un sitio vacío</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve" approved="yes">
-        <source>Create a new site package</source>
-        <target state="final">Crear un nuevo sitio de paquete</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve" approved="yes">
-        <source>VendorName.MyPackageKey</source>
-        <target state="final">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
         <source>No sites available</source>
         <target state="translated">No hay sitios disponibles</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve" approved="no">
-        <source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-        <target state="translated">El paquete&lt;em&gt;Kickstarter de Neos&lt;/em&gt; no está instalado, instálelo para iniciar los nuevos sitios.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
         <source>New site</source>
         <target state="translated">Nuevo sitio</target>
@@ -701,26 +685,6 @@ Haga clic en uno de los nodos para ver solo sus alternativas y variantes. Haga c
         <source>The site "{0}" has been updated.</source>
         <target state="translated">El sitio "{0}" ha sido actualizado.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-        <source>Missing Package</source>
-        <target state="translated">Paquete perdido</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-        <source>The package "{0}" is required to create new site packages.</source>
-        <target state="translated">El paquete "{0}" es necesario para crear nuevos paquetes para el sitio.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-        <source>Invalid package key</source>
-        <target state="translated">Clave del paquete no válida</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-        <source>The package key "{0}" already exists.</source>
-        <target state="translated">La clave de paquete "{0}" ya existe.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-        <source>Site package {0} was created.</source>
-        <target state="translated">Se ha creado el paquete de sitio {0}.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
         <source>The site has been imported.</source>
         <target state="translated">El sitio ha sido importado.</target>
diff --git a/Neos.Neos/Resources/Private/Translations/fi/Modules.xlf b/Neos.Neos/Resources/Private/Translations/fi/Modules.xlf
index 79def421a91..6b3301e9d8f 100644
--- a/Neos.Neos/Resources/Private/Translations/fi/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/fi/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="fi">
     <body>
       <trans-unit id="back" xml:space="preserve" approved="yes">
-				<source>Back</source>
+        <source>Back</source>
         <target state="final">Takaisin</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve" approved="yes">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="final">Peruuta</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve" approved="yes">
-				<source>Management</source>
+        <source>Management</source>
         <target state="final">Hallinta</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve" approved="yes">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="final">Sisältää useita sisällön hallintaan liittyviä moduuleja</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve" approved="yes">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="final">Ylläpito</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve" approved="yes">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="final">Sisältää useita hallintamoduuleita</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve" approved="yes">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="final">Käyttäjähallinta</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve" approved="yes">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="final">Käyttäjähalinta-moduuli näyttää kaikki hallintakäyttäliittymän käyttäjät. Voit ryhmitellä käyttäjät ominaisuuksien mukaan ja hallita käyttäjien oikeuksia, tiedostoliitäntöjä, ryhmäjäsenyyksiä jne... Tämä moduuli on tärkeä työkalu sen varmistamiseksi että käyttäjät on märitelty oikein.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve" approved="yes">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="final">Yhteenveto</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve" approved="yes">
-				<source>Show</source>
+        <source>Show</source>
         <target state="final">Näytä</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve" approved="yes">
-				<source>New</source>
+        <source>New</source>
         <target state="final">Uusi</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Muokkaa</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve" approved="yes">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="final">Muokkaa tiliä</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve" approved="yes">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="final">Uusi sähköpostiosoite</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Käytä järjestelmän oletusta</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve" approved="yes">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="final">Luo käyttäjä</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve" approved="yes">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="final">Luo uusi käyttäjä</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve" approved="yes">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="final">Käyttäjätiedot</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Käyttäjätunnus</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve" approved="yes">
-				<source>Password</source>
+        <source>Password</source>
         <target state="final">Salasana</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve" approved="yes">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="final">Toista salasana</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve" approved="yes">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="final">Rooli(t)</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve" approved="yes">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="final">Tunnistaumispalvelu</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Käytä järjestelmän oletusta</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Henkilötiedot</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve" approved="yes">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="final">Etunimi</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve" approved="yes">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="final">Sukunimi</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve" approved="yes">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="final">Käyttäjäasetukset</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="final">Käyttöliittymän kieli</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve" approved="yes">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="final">Luo käyttäjä</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve" approved="yes">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="final">Käyttäjän tiedot</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Henkilötiedot</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve" approved="yes">
-				<source>Title</source>
+        <source>Title</source>
         <target state="final">Otsikko</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve" approved="yes">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="final">Etunimi</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve" approved="yes">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="final">Toinen nimi</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve" approved="yes">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="final">Sukunimi</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve" approved="yes">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="final">Muu nimi</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve" approved="yes">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="final">Tilit</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Käyttäjätunnus</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Roolit</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve" approved="yes">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="final">Sähköiset osoitteet</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve" approved="yes">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="final">Ensisijainen</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve" approved="yes">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="final">Ei saatavilla</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve" approved="yes">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="final">Poista käyttäjä</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Muokkaa käyttäjää</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve" approved="yes">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="final">Et voi poistaa käyttäjää jolla olet kirjautuneena.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve" approved="yes">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="final">Klikkaa tästä poistaaksesi käyttäjän</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="final">Haluatko varmasti poistaa käyttäjän "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve" approved="yes">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="final">Kyllä, poista käyttäjä</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve" approved="yes">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="final">Tämä poistaa käyttäjän, käyttäjään liitetyt tilit ja työtilat, mukaanlukien työtilojen kaikki julkaisematon sisältö.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve" approved="yes">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="final">Tätä toimintoa ei voi kumota</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve" approved="yes">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="final">Muokkaa tiliä "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve" approved="yes">
-				<source>Account</source>
+        <source>Account</source>
         <target state="final">Tili</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Käyttäjätunnus</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve" approved="yes">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="final">Käyttäjätunnusta ei voi muuttaa käyttäjähallinnan kautta</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve" approved="yes">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="final">Tallenna tili</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve" approved="yes">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="final">Toista salasana</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Roolit</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve" approved="yes">
-				<source>Name</source>
+        <source>Name</source>
         <target state="final">Nimi</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve" approved="yes">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="final">Tilit ja roolit</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve" approved="yes">
-				<source>View user</source>
+        <source>View user</source>
         <target state="final">Näytä käyttäjä</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve" approved="yes">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="final">Muokkaa käyttäjää</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve" approved="yes">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="final">Poista käyttäjä</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve" approved="yes">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="final">Et voi poistaa käyttäjää jolla olet kirjautuneena.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="final">Haluatko varmasti poistaa käyttäjän "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve" approved="yes">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="final">Tämä poistaa käyttäjän, käyttäjään liitetyt tilit ja työtilat, mukaanlukien työtilojen kaikki julkaisematon sisältö.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve" approved="yes">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="final">Kyllä, poista käyttäjä</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve" approved="yes">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="final">Muokkaa käyttäjää "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve" approved="yes">
-				<source>Home</source>
+        <source>Home</source>
         <target state="final">Koti</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve" approved="yes">
-				<source>Work</source>
+        <source>Work</source>
         <target state="final">Työ</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve" approved="yes">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="final">Pakettien hallinta</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve" approved="yes">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="final">Paketinhallinta-moduuli sisältää yhteenvedon kaikista paketeista. Voit aktivoida ja deaktivoida yksittäisiä paketteja, tuoda uusia paketteja ja poistaa olemassaolevia paketteja. Se mahdollistaa myös pakettien lukituksen hallinnan kehityskontekstissa.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve" approved="yes">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="final">Saatavilla olevat paketit</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve" approved="yes">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="final">Paketin nimi</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve" approved="yes">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="final">Paketin avain</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve" approved="yes">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="final">Paketin tyyppi</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve" approved="yes">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="final">Poistettu käytöstä</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve" approved="yes">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="final">Tämä paketti on tällä hetkellä jäädytetty. Klikkaa vapauttaaksesi se.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve" approved="yes">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="final">Jäädytä paketti nopeuttaaksesi sivustoa.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve" approved="yes">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="final">Tämä paketti on suojattu ja sitä ei voi poistaa käytöstä.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve" approved="yes">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="final">Poista paketti käytöstä</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve" approved="yes">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="final">Ota paketti käyttöön</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve" approved="yes">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="final">Tämä paketti on suojattu ja sitä ei voi poistaa.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve" approved="yes">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="final">Poista paketti</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="final">Haluatko todella poistaa "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve" approved="yes">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="final">Kyllä, poista paketti</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve" approved="yes">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="final">Kyllä, poista paketit</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="final">Haluatko todella poistaa valitut paketit?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve" approved="yes">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="final">Jäädytä valitut paketit</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve" approved="yes">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="final">Vapauta valitut paketit</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve" approved="yes">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="final">Poista valitut paketit</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve" approved="yes">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="final">Poista käytöstä valitut paketit</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve" approved="yes">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="final">Ota käyttöön valitut paketit</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve" approved="yes">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="final">Sivustojen hallinta</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve" approved="yes">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="final">Sivustojen hallinta-moduulin avulla voit lisätä, muokata ja poistaa sivustoja ja niiden tietoja, esimerkiksi lisätä uuden verkkotunnuksen.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="needs-translation">Add new site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve" approved="yes">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="final">Luo sivusto</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve" approved="yes">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="final">Luo uusi sivusto</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="needs-translation">Root node name</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="needs-translation">Domains</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve" approved="yes">
-				<source>Site</source>
+        <source>Site</source>
         <target state="final">Sivusto</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve" approved="yes">
-				<source>Name</source>
+        <source>Name</source>
         <target state="final">Nimi</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="needs-translation">Default asset collection</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="needs-translation">Site package</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="needs-translation">Delete this site</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="needs-translation">Deactivate site</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="needs-translation">Activate site</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="needs-translation">Yes, delete the site</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="needs-translation">Import a site</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="needs-translation">Select a site package</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="needs-translation">No site packages are available. Make sure you have an active site package.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="needs-translation">Create a blank site</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="needs-translation">Select a document nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="needs-translation">Site name</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="needs-translation">Create empty site</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="needs-translation">Create a new site package</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="needs-translation">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="needs-translation">No sites available</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The <em>Neos Kickstarter</em> package is not installed, install it to kickstart new sites.</source>
-        <target state="needs-translation">The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="needs-translation">New site</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="needs-translation">New domain</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="needs-translation">Edit domain</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="needs-translation">Domain data</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="needs-translation">e.g. www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="needs-translation">State</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="needs-translation">Create</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve" approved="yes">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="final">Asetukset</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve" approved="yes">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="final">Asetukset-moduli näyttää yleiskatsauksen kaikista asetustyypeistä.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve" approved="yes">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="final">Ulottuvuudet</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="needs-translation">Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="needs-translation">Inter dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="needs-translation">Inter dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="needs-translation">The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
@@ -569,416 +553,396 @@ Primary fallbacks are marked blue and always visible, while lower priority fallb
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="needs-translation">Intra dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="needs-translation">Intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="needs-translation">The intra dimensional fallback graph displays fallbacks within each content dimension.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve" approved="yes">
-				<source>User</source>
+        <source>User</source>
         <target state="final">Käyttäjä</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve" approved="yes">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="final">Käyttäjäasetukset</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve" approved="yes">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="final">Tämän moduulin avulla voit muokata käyttäjäprofiilisi tietoja. Voit vaihtaa järjestelmän kielen, nimesi ja sähköpostiosoitteesi. Voit myös muokata muita järjestelmän yleisiä asetuksia.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Muokkaa</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Muokkaa</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve" approved="yes">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="final">Uusi sähköpostiosoite</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve" approved="yes">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="final">Muokkaa tiliä</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Henkilötiedot</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve" approved="yes">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="final">Käyttäjätiedot</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve" approved="yes">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="final">Käyttäjävalikko</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve" approved="yes">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="final">Käyttäjäasetukset</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="final">Käyttöliittymän kieli</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Käytä järjestelmän oletusta</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve" approved="yes">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="final">Tilit</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Käyttäjätunnus</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Roolit</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve" approved="yes">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="final">Tunnistaumispalvelu</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve" approved="yes">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="final">Sähköiset osoitteet</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="final">Haluatko varmasti poistaa</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve" approved="yes">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="final">Kyllä, poista osoite</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve" approved="yes">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="final">Klikkaa lisätäksesi uusi osoite</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve" approved="yes">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="final">Lisää sähköinen osoite</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve" approved="yes">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="final">Tallenna käyttäjä</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Muokkaa käyttäjää</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve" approved="yes">
-				<source>Update</source>
+        <source>Update</source>
         <target state="final">Päivitä</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Muokkaa käyttäjää</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/fr/Modules.xlf b/Neos.Neos/Resources/Private/Translations/fr/Modules.xlf
index 3d6f6064fb2..80bffca7e7b 100644
--- a/Neos.Neos/Resources/Private/Translations/fr/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/fr/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="fr">
     <body>
       <trans-unit id="back" xml:space="preserve" approved="yes">
-				<source>Back</source>
+        <source>Back</source>
         <target state="final">Retour</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve" approved="yes">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="final">Annuler</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve" approved="yes">
-				<source>Management</source>
+        <source>Management</source>
         <target state="final">Gestion</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve" approved="yes">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="final">Contient plusieurs modules liés à la gestion de contenu</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve" approved="yes">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="final">Administration</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve" approved="yes">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="final">Contient plusieurs modules associés à l'administration</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve" approved="yes">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="final">Gestion des utilisateurs</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve" approved="yes">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="final">Le module de gestion des utilisateurs vous donne un aperçu de tous les utilisateurs backend. Vous pouvez les regrouper par leurs propriétés, afin de pouvoir avoir une vue d'ensemble sur leurs autorisations, points de montage de fichiers, appartenance aux groupes etc... Ce module est un outil indispensable afin de s'assurer que les utilisateurs sont correctement configurés.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve" approved="yes">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="final">Apercu</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve" approved="yes">
-				<source>Show</source>
+        <source>Show</source>
         <target state="final">Afficher</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve" approved="yes">
-				<source>New</source>
+        <source>New</source>
         <target state="final">Nouveau</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Edition</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve" approved="yes">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="final">Edité le profile</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve" approved="yes">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="final">Nouvelle adresse électronique</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Utiliser les paramètres par défaut</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve" approved="yes">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="final">Créer un utilisateur</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve" approved="yes">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="final">Créer un nouvel utilisateur</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve" approved="yes">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="final">Données utilisateur</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Nom d'utilisateur</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve" approved="yes">
-				<source>Password</source>
+        <source>Password</source>
         <target state="final">Mot de passe</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve" approved="yes">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="final">Répéter votre mot de passe</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve" approved="yes">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="final">Rôle(s)</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve" approved="yes">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="final">Fournisseur d'authentification</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Utiliser les paramètres par défaut</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Données personnelles</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve" approved="yes">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="final">Prénom</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve" approved="yes">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="final">Nom</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve" approved="yes">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="final">Préférences utilisateur</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="final">Langue de l'interface</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve" approved="yes">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="final">Créer un utilisateur</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve" approved="yes">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="final">Détails de l'utilisateur</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Données personnelles</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve" approved="yes">
-				<source>Title</source>
+        <source>Title</source>
         <target state="final">Titre</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve" approved="yes">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="final">Prénom</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve" approved="yes">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="final">Deuxième prénom</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve" approved="yes">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="final">Nom</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve" approved="yes">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="final">Autre nom</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve" approved="yes">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="final">Comptes</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Nom d'utilisateur</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Rôles</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve" approved="yes">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="final">Adresses électroniques</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve" approved="yes">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="final">Principal</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve" approved="yes">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="final">Non disponible</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve" approved="yes">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="final">Supprimer l'utilisateur</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Editer l'utilisateur</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve" approved="yes">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="final">Vous êtes connecté en tant que cet utilisateur et vous ne pouvez pas supprimer vous-même.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve" approved="yes">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="final">Cliquez ici pour supprimer cet utilisateur</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="final">Voulez-vous réellement supprimer le Job "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve" approved="yes">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="final">Oui, supprimer l'utilisateur</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve" approved="yes">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="final">Ceci supprimera l'utilisateur, les comptes connexes et son espace de travail personnel, y compris les contenus non publiés.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve" approved="yes">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="final">Cette opération ne peut ptre annulée</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve" approved="yes">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="final">Modifier le compte «{accountIdentifier} »</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve" approved="yes">
-				<source>Account</source>
+        <source>Account</source>
         <target state="final">Compte</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Nom d'utilisateur</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve" approved="yes">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="final">Le nom d'utilisateur n'est pas modifiable par l'intermédiaire de l'interface utilisateur</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve" approved="yes">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="final">Enregistrer un compte</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve" approved="yes">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="final">Répéter votre mot de passe</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Rôles</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve" approved="yes">
-				<source>Name</source>
+        <source>Name</source>
         <target state="final">Nom</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve" approved="yes">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="final">Comptes et Rôles</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve" approved="yes">
-				<source>View user</source>
+        <source>View user</source>
         <target state="final">Voir le profil</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve" approved="yes">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="final">Éditer cet utilisateur</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve" approved="yes">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="final">Supprimer cet utilisateur</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve" approved="yes">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="final">Vous êtes connecté en tant que cet utilisateur et vous ne pouvez pas supprimer vous-même.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="final">Voulez-vous réellement supprimer le Job "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve" approved="yes">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="final">Ceci supprimera l'utilisateur, les comptes connexes et son espace de travail personnel, y compris les contenus non publiés.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve" approved="yes">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="final">Oui, supprimer l'utilisateur</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve" approved="yes">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="final">Editer utilisateur « {0} »</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve" approved="yes">
-				<source>Home</source>
+        <source>Home</source>
         <target state="final">Accueil</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve" approved="yes">
-				<source>Work</source>
+        <source>Work</source>
         <target state="final">Travail</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve" approved="yes">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="final">Gestion des paquets</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve" approved="yes">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="final">Le module "Gestion des paquets" vous donne un aperçu de tous les paquets. Vous pouvez activer ou désactiver chaque paquet, importer de nouveaux paquets et supprimer des paquets existants. Le module vous donne également la possibilité de mettre en pause ou activer des paquets, ....</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve" approved="yes">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="final">Packages disponibles</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve" approved="yes">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="final">Nom du package</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve" approved="yes">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="final">Clé de package</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve" approved="yes">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="final">Type de package</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve" approved="yes">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="final">Désactivée</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve" approved="yes">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="final">Ce paquet est actuellement gelé. Cliquez pour le dégeler.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve" approved="yes">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="final">Geler le paquet afin d'accélérer votre site Web.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve" approved="yes">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="final">Ce paquet est protégé et ne peut pas être désactivé.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve" approved="yes">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="final">Désactiver le paquet</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve" approved="yes">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="final">Activer le package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve" approved="yes">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="final">Ce paquet est protégé et ne peut pas être supprimé.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve" approved="yes">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="final">Supprimer ce package</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="final">Voulez-vous vraiment supprimer "{0}" ?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve" approved="yes">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="final">Oui, supprimer le package</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve" approved="yes">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="final">Oui, supprimer les packages</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="final">Voulez-vous vraiment supprimer les packages sélectionnés ?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve" approved="yes">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="final">Geler les packages sélectionnés</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve" approved="yes">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="final">Dégeler les packages sélectionnés</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve" approved="yes">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="final">Supprimer les packages sélectionnées</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve" approved="yes">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="final">Désactiver les packages sélectionnés</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve" approved="yes">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="final">Activer les paquets sélectionnés</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve" approved="yes">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="final">Gestion des sites</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve" approved="yes">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="final">Le module "Gestion des sites" vous donne un aperçu de tous vos sites. Vous pouvez éditer, ajouter et supprimer des informations sur vos site, tel que l'ajout d'un nouveau domaine.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="translated">Ajouter un site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve" approved="yes">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="final">Créer un site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve" approved="yes">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="final">Créer un nouveau site</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="translated">Nom du dossier racine</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="translated">Domaines</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve" approved="yes">
-				<source>Site</source>
+        <source>Site</source>
         <target state="final">Site</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve" approved="yes">
-				<source>Name</source>
+        <source>Name</source>
         <target state="final">Nom</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="translated">Collection de contenu par défaut</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="translated">Pack de site</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="translated">Supprimer ce site</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="translated">Désactivé ce site</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="translated">Activé ce site</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Êtes-vous sûr de vouloir supprimer "{0}"? Cette action est irréversible.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="translated">Oui, je veux supprimer le site</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="translated">Importer un site</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="translated">Sélectionner un package pour le site</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="translated">Aucun package pour le site n'est disponible. Assurez-vous que vous avez un package actif.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="translated">Créer un site de zéro</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="translated">Selectionnez un document nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="translated">Nom du site</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="translated">Créer un site vide</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="translated">Créer un package pour le site</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="translated">NomDuVendeur.MaCléDuPackage</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="translated">Aucun sites disponibles</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-        <target state="translated">Le package &lt;em&gt;Neos Kickstarter&lt;/em&gt; n'est pas installé, Installez le pour lancer un nouveau site en kickstart.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="translated">Nouveau site</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Êtes-vous sûr de vouloir supprimer "{0}"? Cette action est irréversible.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="translated">Nouveau domaine</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="translated">Modifier le domaine</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="translated">Données du domaine</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="translated">par exemple www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="translated">Etat</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="translated">Créer</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve" approved="yes">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="final">Configuration</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve" approved="yes">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="final">Le module de Configuration vous donne un aperçu de tous les types de configuration.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve" approved="yes">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="final">Dimensions</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="translated">Donne une vue d'ensemble graphique sur les options de replis configurée dans le contenu de chaque dimension et à travers les dimensions du contenu.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="translated">Graphique de repli interdimensionnel</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="translated">Interdimensionnel</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="translated">Le graphique de repli inter-dimensionnel affiche tous les replis possibles (affichés comme des arêtes) entre les sous-graphes (combinaisons de valeurs de dimension de contenu, affichées comme des nœuds).
@@ -569,416 +553,396 @@ Les replis primaires sont marqués en bleu et toujours visibles, tandis que les
 Cliquez sur l'un des nœuds pour ne voir que ses substituts et ses variantes. Cliquez à nouveau pour supprimer le filtre.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="translated">Graphique de repli interdimensionnel</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="translated">Interdimensionnel</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="translated">Le graphique de repli intra-dimensionnel affiche les replis au sein de chaque dimension de contenu.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve" approved="yes">
-				<source>User</source>
+        <source>User</source>
         <target state="final">Utilisateur</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve" approved="yes">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="final">Paramètres utilisateur</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve" approved="yes">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="final">Ce module vous permet de personnaliser l'interface d'administration. Vous pouvez choisir votre langue, nom et adresse électronique. Vous pouvez aussi configurer d'autres paramètres généraux de l'interface.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Edition</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Edition</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve" approved="yes">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="final">Nouvelle adresse électronique</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve" approved="yes">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="final">Edité le profile</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Données personnelles</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve" approved="yes">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="final">Données utilisateur</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve" approved="yes">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="final">Menu utilisateur</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve" approved="yes">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="final">Préférences utilisateur</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="final">Langue de l'interface</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Utiliser les paramètres par défaut</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve" approved="yes">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="final">Comptes</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Nom d'utilisateur</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Rôles</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve" approved="yes">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="final">Fournisseur d'authentification</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve" approved="yes">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="final">Adresses électroniques</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="final">Confirmez-vous la suppression</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve" approved="yes">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="final">Oui, supprimer l'adresse électronique</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve" approved="yes">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="final">Cliquez ici pour ajouter une nouvelle adresse électronique</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve" approved="yes">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="final">Ajouter une adresse électronique</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve" approved="yes">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="final">Sauvegarder l'utilisateur</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Editer l'utilisateur</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve" approved="yes">
-				<source>Update</source>
+        <source>Update</source>
         <target state="final">Mise à jour</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Editer l'utilisateur</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/hu/Modules.xlf b/Neos.Neos/Resources/Private/Translations/hu/Modules.xlf
index 9c266679e6f..a2fdd45f0d5 100644
--- a/Neos.Neos/Resources/Private/Translations/hu/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/hu/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="hu">
     <body>
       <trans-unit id="back" xml:space="preserve">
-				<source>Back</source>
+        <source>Back</source>
         <target state="translated">Vissza</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">Mégsem</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="translated">Kezelés</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="translated">Több modult tartalmaz, ami kapcsolódik a tartalomhoz</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="translated">Adminisztráció</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="translated">Több modult tartalmaz, ami kapcsolódik az adminisztrációhoz</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="translated">Felhasználókezelés</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="translated">A felhasználó kezelő modul áttekintést nyújt az összes háttér felhasználóról. Csoportosíthatod őket a tulajdonságaik alapján és kezelni tudod a jogosultságaikat, fájlcsatolásokat, felhasználói csoportokat stb.. Ez a modul nélkülözhetetlen annak érdekében, hogy megbizonyosodj az összes felhasználó helyes beállításáról.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="translated">Áttekintés</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="translated">Mutat</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="translated">Új</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Szerkesztés</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Fiók szerkesztése</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Új elektronikus cím</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Alapértelmezett használata</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Felhasználó létrehozása</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="translated">Új felhasználó készítés</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Felhasználói adatok</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Felhasználó</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">Jelszó</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Ismételje meg a jelszót</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="translated">Szabályzat</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">Hitelesítés szükséges</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Alapértelmezett használata</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Személyes adatok</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Keresztnév</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Családnév</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">Felhasználói beállítások</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">Kezelőfelület nyelve</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Felhasználó létrehozása</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="translated">Felhasználó részletei</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Személyes adatok</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">Cím</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Keresztnév</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="translated">Középső név</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Családnév</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="translated">Másik név</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Fiókok</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Felhasználó</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Szerepek</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="translated">Elektronikus címek</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="translated">Elsődleges</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="translated">N/A</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="translated">Felhasználó törlése</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Felhasználó szerkesztése</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">Felhasználóként van bejelentkezve, nem törölheti magát.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="translated">Kattintson ide a felhasználó törléséhez</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">Valóban törölni akarja a felhasználót {0}?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">Igen, törlöm a felhasználót</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">Ezzel törli a felhasználót, a kapcsolódó felhasználók és a személyes munkaterület, beleértve minden Nem publikált tartaltalmat.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="translated">Ez a művelet nem vonható vissza</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="translated">Felhasználó szerkesztése "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="translated">Fiók</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Felhasználó</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="translated">A felhasználónév nem változtatható meg a felületről</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="translated">Fiók mentése</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Ismételje meg a jelszót</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Szerepek</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Név</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="translated">Fiókok és szerepek</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="translated">Felhasználó megtekintése</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="translated">Felhasználó szerkesztése</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="translated">Felhasználó törlése</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">Felhasználóként van bejelentkezve, nem törölheti magát.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">Valóban törölni akarja a felhasználót {0}?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">Ezzel törli a felhasználót, a kapcsolódó felhasználók és a személyes munkaterület, beleértve minden Nem publikált tartaltalmat.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">Igen, törlöm a felhasználót</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="translated">Felhasználó szerekesztése "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="translated">Kezdőlap</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="translated">Munka</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="translated">Csomagkezelés</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="translated">A csomagkezelő modul áttekintést nyújt önnek a csomagjai között. Aktiválhatja és deaktiválhatja az egyes csomagokat, új csomagokat importálhat és törölheti a meglévő csomagokat. Ez szolgáltat önnek egy képességet, amivel lefagyaszthatja és a feloldhatja a csomagokat fejlesztési összefüggésben.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="translated">Elérhető csomagok</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="translated">Csomagnév</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="translated">Csomagszám</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="translated">Csomag típusa</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="translated">Deaktiválva</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="translated">A csomag le lett fagyasztva. Kattintson ide a kiolvasztáshoz.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="translated">Fagyassza le a csomagot annak érdekében, hogy felgyorsítsa az oldalt.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="translated">Ez a csomag védelem alatt áll és nem lehet deaktiválni.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="translated">Csomag deaktiválása</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="translated">Csomag aktiválása</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="translated">Ez a csomag védelem alatt áll és nem lehet törölni.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="translated">Csomag törlése</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="translated">Valóban törölni akarja "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="translated">Igen, törlöm a csomagot</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="translated">Igen, törlöm a csomagokat</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="translated">Biztosan törli a kijelölt csomagokat?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="translated">Kiválasztott csomagok fagyasztása</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="translated">Kiválasztott csomagok kiolvasztása</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="translated">Kiválasztott csomagok törlése</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="translated">Kiválasztott csomagok deaktiválása</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="translated">Kiválasztott csomagok aktiválása</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="translated">Oldalak kezelése</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="translated">A webhely kezelési modul áttekintést nyújt önnek az összes oldalon. Szerkeszteni, hozzáadáadni, és törölheti az adatokat az oldalról és új domainhez adni.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="translated">Új oldal</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="translated">Oldal létrehozása</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="translated">Új oldal létrehozása</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="translated">Root neve</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="translated">Domainek</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="translated">Oldal</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Név</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="translated">Alap eszközök</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="translated">Oldal csomag</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="translated">Oldal törlése</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="translated">Oldal deaktiválása</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="translated">Aktív oldal</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Biztos törölni akarja "{0}"? Ez a lépés nem vonható vissza.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="translated">Igen, törölje az oldalt</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="translated">Oldal importálása</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="translated">Válasszony csomagot</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="translated">Nincs elérhető csomag. Bizonyosodj meg, hogy van aktív csomagod.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="translated">Űrlap létrehozása</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="translated">Válasszon dokumentum típust</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="translated">Oldal neve</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="translated">Üres oldal létrehozása</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="translated">Új csomag létrehozása</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="translated">EladóNeve.Csomagom</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="translated">Nincs elérhető oldal</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-        <target state="translated">A &lt;em&gt;Neos Kickstarter&lt;/em&gt; csomag nincs telepítve, telepítse új oldalra.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="translated">Új oldal</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Biztos törölni akarja "{0}"? Ez a lépés nem vonható vissza.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="translated">Új domain</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="translated">Domain szerkesztése</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="translated">Domain adatok</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="translated">pl: www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="translated">Állam</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="translated">Létrehozás</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="translated">Konfiguráció</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="translated">A konfigurációs modul segítségével áttekintést nyer az összes konfigurációs típussal.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="translated">Dimenziók</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="needs-translation">Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="translated">Több dimenziós átmeneti grafikon</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="translated">Több dimenzió</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="needs-translation">The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
@@ -569,416 +553,396 @@ Primary fallbacks are marked blue and always visible, while lower priority fallb
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="needs-translation">Intra dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="needs-translation">Intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="needs-translation">The intra dimensional fallback graph displays fallbacks within each content dimension.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="translated">Felhasználó</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="translated">Felhasználói beállítások</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="translated">Ez a modul engedélyezi, hogy személyre szabja a háttérfélhasználók profilját. Itt megváltoztathatja az aktív rendszer nyelvét, nevét és e-mail címét. Az általános tulajdonságokat a rendszer részben találja.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Szerkesztés</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Szerkesztés</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Új elektronikus cím</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Fiók szerkesztése</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Személyes adatok</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Felhasználói adatok</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="translated">Felhasználói menü</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">Felhasználói beállítások</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">Kezelőfelület nyelve</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Alapértelmezett használata</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Fiókok</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Felhasználó</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Szerepek</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">Hitelesítés szükséges</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="translated">Elektronikus címek</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="translated">Biztosan törlöd</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="translated">Igen, törlöm az elektronikus címet</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="translated">Kattintson az új elektronikus cím hozzáadásához</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="translated">Elektronikus cím hozzáadása</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="translated">Felhasználó mentése</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Felhasználó szerkesztése</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">Frissítés</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Felhasználó szerkesztése</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/id_ID/Modules.xlf b/Neos.Neos/Resources/Private/Translations/id_ID/Modules.xlf
index b75618a821d..90710d17144 100644
--- a/Neos.Neos/Resources/Private/Translations/id_ID/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/id_ID/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="id">
     <body>
       <trans-unit id="back" xml:space="preserve">
-				<source>Back</source>
+        <source>Back</source>
         <target state="translated">Kembali</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">Batalkan</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="translated">Manajemen</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="translated">Mengandung banyak modul yang berkaitan dengan manajemen konten</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="translated">Administrasi</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="translated">Mengandung banyak modul yang berkaitan dengan administrasi</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="translated">Manajemen pengguna</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="translated">Modul manajemen pengguna memberikan Anda gambaran dari semua pengguna backend. Anda dapat mengelompokkan mereka berdasarkan properti mereka sehingga Anda dapat memantau izin, filemounts, kelompok-kelompok anggota dll... Modul ini adalah alat yang sangat diperlukan untuk memastikan pengguna yang dikonfigurasi dengan benar.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="translated">Sekilas</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="translated">Tampilkan</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="translated">Baru</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Ubah</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Edit akun</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Alamat elektronik baru</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Gunakan bawaan sistem</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Membuat pengguna</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="translated">Membuat pengguna baru</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Data pengguna</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Nama Pengguna</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">Kata sandi</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Ulangi kata sandi</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="translated">Peran (s)</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">Penyedia otentikasi</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Gunakan bawaan sistem</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Data Pribadi</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Nama Depan</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Nama Belakang</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">Preferensi pengguna</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">Bahasa antarmuka</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Membuat pengguna</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="translated">Rincian untuk pengguna</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Data Pribadi</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">Judul</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Nama Depan</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="translated">Nama Tengah</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Nama Belakang</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="translated">Nama lain</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Akun</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Nama Pengguna</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Peran</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="translated">Alamat Elektronik</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="translated">Utama</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="translated">N/A</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="translated">Menghapus pengguna</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Edit pengguna</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">Anda login sebagai user ini dan Anda tidak dapat menghapus diri sendiri.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="translated">Klik di sini untuk menghapus pengguna ini</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">Apakah Anda benar-benar ingin menghapus pengguna "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">Ya, Hapus pengguna</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">Ini akan menghapus pengguna, account terkait dan bidang kerja pribadinya, termasuk konten semua yang belum di publikasikan.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="translated">Operasi ini tidak bisa dibatalkan</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="translated">Edit akun "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="translated">Akun</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Nama Pengguna</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="translated">Nama pengguna tidak dapat diubah melalui antarmuka pengguna</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="translated">Simpan Akun</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Ulangi kata sandi</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Peran</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Nama</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="translated">Akun dan peran</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="translated">Lihat pengguna</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="translated">Edit pengguna</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="translated">Menghapus pengguna</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">Anda login sebagai user ini dan Anda tidak dapat menghapus diri sendiri.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">Apakah Anda benar-benar ingin menghapus pengguna "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">Ini akan menghapus pengguna, account terkait dan bidang kerja pribadinya, termasuk konten semua yang belum di publikasikan.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">Ya, Hapus pengguna</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="translated">Mengedit pengguna "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="translated">Home</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="translated">Pekerjaan</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="translated">Manajemen Paket</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="translated">Modul manajemen paket memberikan Anda gambaran dari semua paket. Anda dapat mengaktifkan dan menonaktifkan paket individu, mengimpor paket baru dan menghapus paket yang ada. Ini juga menyediakan Anda dengan kemampuan untuk membekukan dan mengembalikan paket dalam konteks pembangunan.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="translated">Paket yang tersedia</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="translated">Nama paket</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="translated">Kunci paket</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="translated">Tipe Paket</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="translated">Dinonaktifkan</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="translated">Paket tersebut saat ini dibekukan. Klik untuk mengembalikan.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="translated">Bekukan paket untuk mempercepat website Anda.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="translated">Paket ini dilindungi dan tidak dapat dinonaktifkan.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="translated">Menonaktifkan paket</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="translated">Aktifkan paket</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="translated">Paket ini dilindungi dan tidak dapat dihapus.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="translated">Menghapus paket</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="translated">Apakah Anda benar-benar ingin menghapus "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="translated">Ya, menghapus paket</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="translated">Ya, menghapus paket-paket</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="translated">Apakah Anda benar-benar ingin menghapus paket yang dipilih?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="translated">Bekukan paket Terpilih</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="translated">Kembalikan paket Terpilih</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="translated">Menghapus paket-paket yang dipilih</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="translated">Menonaktifkan paket Terpilih</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="translated">Aktifkan paket Terpilih</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="translated">Manajemen situs</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="translated">Modul manajemen situs memberikan Anda gambaran dari semua situs. Anda dapat mengedit, menambah dan menghapus informasi tentang situs Anda, misalnya menambahkan domain baru.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="translated">Tambah situs baru</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="translated">Membuat situs</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="translated">Membuat situs baru</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="translated">Nama simpul akar</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="translated">Domain</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="translated">Situs</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Nama</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="translated">Koleksi aset terpasang</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="translated">Paket situs</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="translated">Hapus situs ini</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="translated">Nonaktifkan situs</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="translated">Aktifkan situs</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Apakah Anda benar-benar ingin menghapus "{0}"? ini tidak dapat dipulihkan.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="translated">Ya, hapus situs tersebut</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="translated">Impor situs</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="translated">Pilih paket situs</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="translated">Tidak ada paket situs yang tersedia. Pastikan Anda memiliki paket situs yang aktif.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="translated">Buat situs kosong</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="translated">Pilih nodeType dokumen</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="translated">Nama situs</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="translated">Buat situs kosong</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="translated">Buat paket situs baru</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="translated">NamaPenyediaLayanan.KodeKunciPaketSaya</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="translated">Tidak ada situs tersedia</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-        <target state="translated">Paket &lt;em&gt;Neos Kickstarter&lt;/em&gt; belum terpasang, silakan memasangnya ke situs baru kickstart.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="translated">Situs baru</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Apakah Anda benar-benar ingin menghapus "{0}"? ini tidak dapat dipulihkan.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="translated">Domain baru</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="translated">Edit domain</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="translated">Data domain</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="translated">Cth. www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="translated">Negara</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="translated">Buat</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="translated">Konfigurasi</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="translated">Konfigurasi modul memberikan Anda gambaran dari semua jenis konfigurasi.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="translated">Dimensi</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="translated">Berikan ikhtisar grafis mengenai penggabungan yang dikonfigurasi dalam setiap dimensi konten dan dimensi konten.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="translated">Grafik fallback antar dimensi</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="translated">Dimensi inter</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="translated">Grafik fallback antar dimensi menampilkan semua kemungkinan fallback (ditampilkan sebagai sisi) antara subgraf (kombinasi nilai dimensi konten, ditampilkan sebagai node).
@@ -569,416 +553,396 @@ Penggantian utama ditandai biru dan selalu terlihat, sementara fallback yang leb
 Klik salah satu node untuk hanya melihat fallback dan variannya. Klik lagi untuk menghapus filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="translated">Grafik fallback intra dimensi</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="translated">Intra dimensi</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="translated">Grafik fallback intra dimensional menampilkan fallback dalam setiap dimensi konten.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="translated">Pengguna</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="translated">Pengaturan pengguna</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="translated">Modul ini memungkinkan Anda untuk menyesuaikan profil pengguna backend. Di sini Anda dapat mengubah sistem bahasa, nama dan alamat email. Anda juga dapat mengkonfigurasi fitur yang umum dalam sistem.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Ubah</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Ubah</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Alamat elektronik baru</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Edit akun</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Data Pribadi</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Data pengguna</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="translated">Menu pengguna</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">Preferensi pengguna</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">Bahasa antarmuka</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Gunakan bawaan sistem</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Akun</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Nama Pengguna</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Peran</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">Penyedia otentikasi</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="translated">Alamat Elektronik</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="translated">Apakah Anda benar-benar ingin menghapus</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="translated">Ya, menghapus alamat elektronik</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="translated">Klik untuk menambahkan alamat elektronik baru</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="translated">Tambahkan alamat elektronik</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="translated">Simpan pengguna</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Edit pengguna</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">Pembaruan</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Edit pengguna</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/it/Modules.xlf b/Neos.Neos/Resources/Private/Translations/it/Modules.xlf
index 222116b4a55..4ba48c6ef8a 100644
--- a/Neos.Neos/Resources/Private/Translations/it/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/it/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="it">
     <body>
       <trans-unit id="back" xml:space="preserve">
-				<source>Back</source>
+        <source>Back</source>
         <target state="translated">Indietro</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">Annulla</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="translated">Gestione</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="translated">Contiene moduli multipli relativi all'amministrazione del contenuto</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="translated">Amministrazione</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="translated">Contiene più moduli relativi all'amministrazione</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="translated">Gestione Utenti</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="translated">Il modulo di Gestione Utenti fornisce una panoramica di tutti gli utenti di backend. È possibile raggrupparli in base alle loro proprietà in modo da monitorare i loro permessi, filemounts, i membri dei gruppi ecc... Questo modulo è uno strumento indispensabile al fine di assicurarsi che gli utenti siano configurati correttamente.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="translated">Panoramica</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="translated">Mostra</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="translated">Nuovo</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Modifica</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Modifica Profilo</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Nuovo indirizzo elettronico</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Usa sistema predefinito</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Crea utente</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="translated">Crea un nuovo utente</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Dati Utente</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Nome utente</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">Password</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Ripeti la password</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="translated">Ruolo(i)</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">Servizio di Autenticazione</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Usa sistema predefinito</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Dati Personali</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Nome</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Cognome</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">Preferenze utente</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">Interfaccia Lingua</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Crea utente</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="translated">Dettagli per utente</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Dati Personali</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">Titolo</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Nome</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="translated">Secondo Nome</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Cognome</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="translated">Altro nome</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Profili</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Nome utente</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Ruoli</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="translated">Indirizzi Elettronici</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="translated">Primario</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="translated">N.d.</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="translated">Elimina Utente</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Modifica Utente</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">Sei loggato come questo utente e non puoi eliminarti da solo.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="translated">Clicca qui per eliminare questo utente</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">Vuoi davvero eliminare l'utente "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">Sì, elimina l'utente</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">Questo eliminerà l'utente, gli account relativi ed il suo spazio di lavoro personale, inclusi tutti i contenuti non pubblicati.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="translated">Questa operazione non può essere annullata</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="translated">Modificare l'account "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="translated">Profilo</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Nome utente</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="translated">Il nome utente non può essere modificato tramite l'interfaccia utente</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="translated">Salva account</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Ripeti la password</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Ruoli</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Nome</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="translated">Account e Ruoli</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="translated">Visualizza utente</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="translated">Modifica Utente</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="translated">Elimina utente</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">Sei loggato come questo utente e non puoi eliminarti da solo.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">Vuoi davvero eliminare l'utente "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">Questo eliminerà l'utente, gli account relativi ed il suo spazio di lavoro personale, inclusi tutti i contenuti non pubblicati.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">Sì, elimina l'utente</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="translated">Modifica utente "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="translated">Principale</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="translated">Lavoro</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="translated">Gestione dei pacchetti</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="translated">Il modulo di gestione dei pacchetti fornisce una panoramica di tutti i pacchetti. È possibile attivare e disattivare i singoli pacchetti, importare nuovi pacchetti ed eliminare i pacchetti esistenti. Offre anche la possibilità di bloccare e sbloccare i pacchetti nel contesto di sviluppo.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="translated">Pacchetti disponibili</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="translated">Nome pacchetto</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="translated">Chiave pacchetto</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="translated">Tipo pacchetto</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="translated">Disattivato</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="translated">Questo pacchetto è attualmente congelato. Clicca per scongelarlo.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="translated">Congela il pacchetto per velocizzare il tuo sito web.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="translated">Questo pacchetto è protetto e non può essere disattivato.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="translated">Pacchetto disattivato</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="translated">Pacchetto attivato</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="translated">Questo pacchetto è protetto e non può essere eliminato.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="translated">Elimina pacchetto</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="translated">Vuoi davvero eliminare "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="translated">Sì, elimina il pacchetto</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="translated">Sì, elimina i pacchetti</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="translated">Vuoi veramente eliminare i pacchetti selezionati?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="translated">Congela i pacchetti selezionati</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="translated">Scongela i pacchetti selezionati</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="translated">Elimina pacchetti selezionati</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="translated">Elimina i pacchetti selezionati</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="translated">Attiva pacchetti selezionati</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="translated">Gestione Siti</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="translated">Il modulo di Gestione Siti fornisce una panoramica di tutti i siti. È possibile modificare, aggiungere e cancellare le informazioni sui vostri siti, ad esempio aggiungendo un nuovo dominio.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="translated">Aggiungi nuovo sito</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="translated">Crea sito</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="translated">Crea un nuovo sito</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="translated">Nome Cartella Madre</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="translated">Domini</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="translated">Sito</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Nome</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="translated">Raccolta asset default</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="translated">Pacchetto di siti</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="translated">Cancella questo sito web</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="translated">Disattivare il sito</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="translated">Attivare il sito</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Vuoi veramente cancellare "{0}"? Questa azione non può essere annullata.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="translated">Sì, eliminare il sito</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="translated">Importare una pagina</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="translated">Seleziona pacchetti offline</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="translated">Non ci sono pacchetti offline disponibili. Assicurati di avere un pacchetto offline attivo.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="translated">Creare un sito vuoto</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="translated">Selezionare un documento nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="translated">Nome Sito</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="translated">Creare sito vuoto</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="translated">Creare un nuovo pacchetto di siti</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="translated">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="translated">Nessun sito disponibile</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-        <target state="translated">Non è installato il pacchetto di &lt;em&gt;Neos Kickstarter&lt;/em&gt;, installarlo per fare il kickstart di nuovi siti.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="translated">Nuovo sito</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Vuoi veramente cancellare "{0}"? Questa azione non può essere annullata.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="translated">Nuovo dominio</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="translated">Modifica dominio</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="translated">Dati del dominio</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="translated">es: www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="translated">Stato</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="translated">Crea</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="translated">Configurazione</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="translated">Il modulo Configurazione ti fornisce una panoramica di tutti i tipi di configurazione.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="translated">Dimensioni</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="translated">Concede una panoramica grafica del fallback configurato all'interno di ogni dimensione di contenuto e attraverso dimensioni di contenuti.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="translated">Grafico fallback inter dimensionale</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="translated">Inter dimensionale</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="translated">L'interdimensionale grafico a fallback mostra tutti i possibili fallback (mostrati come limiti) tra sottografici (combinazioni di valore dimensione contenito, mostrato come nodi).
@@ -569,416 +553,396 @@ I fallback primari sono marcati in blu e sempre visibili, mentre fallback di min
 Clicca su uno dei nodi per vedere solo i suoi fallback e varianti. Clicca di nuovo per rimuovere il filtro.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="translated">Grafico fallback intra dimensionale</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="translated">Intra dimensionale</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="translated">Il grafico del fallback intradimensionale mostra i fallback entro ogni dimensione contenuto.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="translated">Utente</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="translated">Impostazioni Utente</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="translated">Questo modulo ti consente di personalizzare il tuo profilo utente di back-end. Qui puoi modificare la tua lingua attiva del sistema, nome ed indirizzo email. Potresti anche configurare altre caratteristiche generali nel sistema.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Modifica</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Modifica</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Nuovo indirizzo elettronico</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Modifica Profilo</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Dati Personali</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Dati Utente</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="translated">Menu Utente</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">Preferenze utente</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">Interfaccia Lingua</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Usa sistema predefinito</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Profili</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Nome utente</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Ruoli</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">Servizio di Autenticazione</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="translated">Indirizzi elettronici</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="translated">Vuoi davvero eliminare</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="translated">Sì, elimina indirizzi elettronici</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="translated">Clicca per aggiungere un nuovo indirizzo Elettronico</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="translated">Aggiungi indirizzo elettronico</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="translated">Salva Utente</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Modifica Utente</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">Aggiornamento</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Modifica Utente</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/ja/Modules.xlf b/Neos.Neos/Resources/Private/Translations/ja/Modules.xlf
index 5a02db41b13..5fa16dd4cab 100644
--- a/Neos.Neos/Resources/Private/Translations/ja/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/ja/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="ja">
     <body>
       <trans-unit id="back" xml:space="preserve">
-				<source>Back</source>
+        <source>Back</source>
         <target state="needs-translation">Back</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">キャンセル</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="needs-translation">Management</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="translated">複数のモジュール管理に関するコンテンツ</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="needs-translation">Administration</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="needs-translation">Contains multiple modules related to administration</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="needs-translation">User Management</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="needs-translation">The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="needs-translation">Overview</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="needs-translation">Show</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="translated">新しい</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">編集</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">アカウント編集</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">新しい電子アドレス</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">システムデフォルトを使用</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">ユーザの作成</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="translated">新規ユーザー</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">ユーザデータ</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">ユーザー名</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">パスワード</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">繰り返しパスワード</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="needs-translation">Role(s)</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="needs-translation">Authentication Provider</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">システムデフォルトを使用</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">個人データ</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">ファーストネーム</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">ラストネーム</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">ユーザーの嗜好</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">インターフェイスの言語</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">ユーザの作成</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="translated">詳細はユーザー</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">個人データ</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">タイトル</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">ファーストネーム</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="translated">ミドルネーム</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">ラストネーム</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="translated">別名</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="needs-translation">Accounts</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">ユーザー名</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="needs-translation">Electronic Addresses</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="translated">プライマリ</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="needs-translation">N/A</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="needs-translation">Delete User</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="needs-translation">Edit User</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">ログインしているとしてこのユーザーを削除することはできません。</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="translated">ここをクリックし削除ユーザー</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="needs-translation">Do you really want to delete the user "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">はい、削除、ユーザー</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">この削除、ユーザーの関係勘定、個人ワークスペースを含む全ての未発表の内容です。</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="translated">この操作はできません下記のいずれかから選択</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="needs-translation">Edit account "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="needs-translation">Account</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">ユーザー名</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="translated">のユーザー名の変更はできませんのユーザインタフェース</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="translated">保存座</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">繰り返しパスワード</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="needs-translation">Name</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="translated">座の役割</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="translated">ビューのユーザー</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="translated">編集ユーザー</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="translated">ユーザー削除</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">ログインしているとしてこのユーザーを削除することはできません。</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="needs-translation">Do you really want to delete the user "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">この削除、ユーザーの関係勘定、個人ワークスペースを含む全ての未発表の内容です。</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">はい、削除、ユーザー</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="needs-translation">Edit user "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="needs-translation">Home</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="needs-translation">Work</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="needs-translation">Package Management</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="needs-translation">The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="needs-translation">Available packages</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="needs-translation">Package Name</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="needs-translation">Package Key</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="needs-translation">Package Type</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="needs-translation">Deactivated</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="needs-translation">This package is currently frozen. Click to unfreeze it.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="needs-translation">Freeze the package in order to speed up your website.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="needs-translation">This package is protected and cannot be deactivated.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="needs-translation">Deactivate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="needs-translation">Activate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="needs-translation">This package is protected and cannot be deleted.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="needs-translation">Delete Package</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="needs-translation">Do you really want to delete "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="needs-translation">Yes, delete the package</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="needs-translation">Yes, delete the packages</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="needs-translation">Do you really want to delete the selected packages?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="needs-translation">Freeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="needs-translation">Unfreeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="needs-translation">Delete selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="needs-translation">Deactivate selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="needs-translation">Activate selected packages</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="needs-translation">Sites Management</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="needs-translation">The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="translated">新しいサイトを追加</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="needs-translation">Create site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="needs-translation">Create a new site</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="translated">ルートノード名</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="translated">ドメイン</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="translated">サイト</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="needs-translation">Name</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="translated">デフォルトの資産収集</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="translated">サイトパッケージ</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="translated">このサイトを削除する</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="translated">サイトを無効にする</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="translated">サイトを有効にする</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="translated">はい、サイトを削除します</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="translated">サイトをインポートする</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="translated">サイトパッケージを選択する</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="translated">利用可能なサイトパッケージはありません。アクティブなサイトパッケージがあることを確認してください。</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="translated">空のサイトを作成する</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="needs-translation">Select a document nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="translated">サイト名</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="translated">空のサイトを作成する</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="translated">新しいサイトパッケージを作成する</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="needs-translation">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="translated">サイトはありません</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The <em>Neos Kickstarter</em> package is not installed, install it to kickstart new sites.</source>
-        <target state="needs-translation">The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="translated">新しいサイト</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="translated">新しいドメイン</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="translated">ドメインの編集</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="translated">ドメインデータ</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="translated">例えば www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="translated">状態</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="translated">作成</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="needs-translation">Configuration</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="needs-translation">The Configuration module provides you with an overview of all configuration types.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="needs-translation">Dimensions</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="needs-translation">Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="translated">次元間のフォールバックグラフ</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="translated">次元間</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="needs-translation">The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
@@ -569,416 +553,396 @@ Primary fallbacks are marked blue and always visible, while lower priority fallb
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="translated">イントラ次元フォールバックグラフ</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="translated">イントラ次元</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="translated">イントラ次元のフォールバックグラフには、各コンテンツディメンション内のフォールバックが表示されます。</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="needs-translation">User</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="needs-translation">User Settings</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="needs-translation">This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">編集</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">編集</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">新しい電子アドレス</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">アカウント編集</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">個人データ</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">ユーザデータ</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="needs-translation">User Menu</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">ユーザーの嗜好</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">インターフェイスの言語</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">システムデフォルトを使用</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="needs-translation">Accounts</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">ユーザー名</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="needs-translation">Authentication Provider</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="needs-translation">Electronic addresses</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="translated">いったい削除</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="needs-translation">Yes, delete electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="needs-translation">Click to add a new Electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="needs-translation">Add electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="needs-translation">Save User</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="needs-translation">Edit User</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">アップデート</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="needs-translation">Edit User</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/km/Modules.xlf b/Neos.Neos/Resources/Private/Translations/km/Modules.xlf
index e18204cb9ed..18a20f8f24f 100644
--- a/Neos.Neos/Resources/Private/Translations/km/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/km/Modules.xlf
@@ -3,567 +3,551 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="km">
     <body>
       <trans-unit id="back" xml:space="preserve" approved="yes">
-				<source>Back</source>
+        <source>Back</source>
         <target state="final">ត្រលប់ក្រោយ</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve" approved="yes">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="final">បោះបង់</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve" approved="yes">
-				<source>Management</source>
+        <source>Management</source>
         <target state="final">គ្រប់គ្រង</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve" approved="yes">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="final">មានម៉ូឌុលច្រើនដែលទាក់ទងទៅនឹងការគ្រប់គ្រងនៃមាតិកា</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve" approved="yes">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="final">រដ្ឋបាល</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve" approved="yes">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="final">ផ្ទុកនូវបណ្ដំុទិន្នន័យជាច្រើនទាក់ទងនិងផ្នែករដ្ឋបាល</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve" approved="yes">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="final">គ្រប់គ្រង​អ្នក​ប្រើប្រាស់</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve" approved="yes">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="final">ការគ្រប់គ្រងលើអក្នប្រើប្រាស់ដែលផ្ដល់ឲ្យនូវទិន្នន័យទាំទអស់របស់អក្នប្រើរ។អក្នអាចត្រួតពិនិត្យជាក្រុមជាមួយនិងសិទ្ទនិងសមាជិកក្នុងក្រុម។មឌុលនេះមានសារប្រយោជន៍ដើម្បីប្រាកដថាអក្នប្រើរប្រាស់បានធ្វើតាមកំណត់</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve" approved="yes">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="final">ការសង្ខេបឡេីងវិញ</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve" approved="yes">
-				<source>Show</source>
+        <source>Show</source>
         <target state="final">បង្ហាញ</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve" approved="yes">
-				<source>New</source>
+        <source>New</source>
         <target state="final">ថ្មី</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">កែប្រែ</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve" approved="yes">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="final">គណនីកែសម្រួល</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve" approved="yes">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="final">បង្កើតអាសយដ្ឋានថ្មី</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">ប្រើប្រព័ន្ធលំនាំដើម</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve" approved="yes">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="final">ការបង្កើតអក្នប្រើប្រាស់</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve" approved="yes">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="final">បង្កើតអ្នកប្រើថ្មី</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve" approved="yes">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="final">ទិន្នន័យរប​ស់​អ្នក​ប្រើ​ប្រាស់</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">ឈ្មោះ​គណនី</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve" approved="yes">
-				<source>Password</source>
+        <source>Password</source>
         <target state="final">ពាក្យ​សម្ងាត់</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve" approved="yes">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="final">វាយលេខកូតសំងាត់ម្តងទៀត</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve" approved="yes">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="final">តួនាទី</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve" approved="yes">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="final">ការផ្ដល់ការផ្ទៀងផ្ទាត់ត្រឹមត្រូវ</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">ប្រើប្រព័ន្ធលំនាំដើម</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">ទិន្នន័យ​ផ្ទាល់​ខ្លួន</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve" approved="yes">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="final">ឈ្មោះ</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve" approved="yes">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="final">នាមត្រកូល</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve" approved="yes">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="final">ជម្រើស​ការប្រើប្រាស់​របស់​អ្នក​​ប្រើ​ប្រាស់​</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="final">ភាសារទំព័រមុខ</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve" approved="yes">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="final">ការបង្កើតអក្នប្រើប្រាស់</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve" approved="yes">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="final">លំអិតសំរាប់អក្នប្រើប្រាស់</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">ទិន្នន័យ​ផ្ទាល់​ខ្លួន</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve" approved="yes">
-				<source>Title</source>
+        <source>Title</source>
         <target state="final">ចំណងជើង</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve" approved="yes">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="final">ឈ្មោះ</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve" approved="yes">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="final">េឈ​្មោះហៅក្រៅ</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve" approved="yes">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="final">នាមត្រកូល</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve" approved="yes">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="final">ឈ្មោះ ផ្សេងទៀត</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve" approved="yes">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="final">គណនី</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">ឈ្មោះ​គណនី</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">តួនាទី</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve" approved="yes">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="final">អាសយដ្ឋានអេឡេចត្រូនិច</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve" approved="yes">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="final">ចម្បង</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve" approved="yes">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="final">គ្មាន​អ្វី​ទំាង​អស់</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve" approved="yes">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="final">លុប​អ្នក​ប្រើ​ប្រាស់​</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">កែ​ប្រែ​អ្ន​ក​ប្រើ​ប្រាស់​</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve" approved="yes">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="final">អ្នក​មិន​អាច​លុប​គណនី​របស់​ខ្លួន​អ្នកបាន​ទេ</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve" approved="yes">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="final">ចុចទីនេះដើម្បីលប់អក្នប្រើប្រាស់</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="final">តើអក្នចង់លប់អក្នប្រើប្រាស់នេះ?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve" approved="yes">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="final">ចាស/បាទលប់អក្នប្រើប្រាស់នេះ</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve" approved="yes">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="final">វានឹងលុបអ្នកប្រើគណនីពាក់ព័ន្ធនិងតំបន់ការងារផ្ទាល់ខ្លួនរបស់លោករួមទាំងមាតិកាដែលមិនបានផ្សព្វផ្សាយទាំងអស់។</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve" approved="yes">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="final">ប្រតិបត្តិការនេះមិនអាចមិនធ្វើវិញ</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve" approved="yes">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="final">កែប្រែគណនី​ "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve" approved="yes">
-				<source>Account</source>
+        <source>Account</source>
         <target state="final">គណនី</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">ឈ្មោះ​គណនី</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve" approved="yes">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="final">ឈ្មេាះគណនីនេះមិនអាចកែប្រែតាមរបៀបនេះបានឡើយ</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve" approved="yes">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="final">រក្សាគណនី</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve" approved="yes">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="final">វាយលេខកូតសំងាត់ម្តងទៀត</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">តួនាទី</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve" approved="yes">
-				<source>Name</source>
+        <source>Name</source>
         <target state="final">ឈ្មោះ</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve" approved="yes">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="final">គណនីនិងតួនាទី</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve" approved="yes">
-				<source>View user</source>
+        <source>View user</source>
         <target state="final">មើលអ្នកប្រើ</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve" approved="yes">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="final">កែតម្រូវ</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve" approved="yes">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="final">លុបអ្នកប្រើ</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve" approved="yes">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="final">អ្នក​មិន​អាច​លុប​គណនី​របស់​ខ្លួន​អ្នកបាន​ទេ</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="final">តើអក្នចង់លប់អក្នប្រើប្រាស់នេះ?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve" approved="yes">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="final">វានឹងលុបអ្នកប្រើគណនីពាក់ព័ន្ធនិងតំបន់ការងារផ្ទាល់ខ្លួនរបស់លោករួមទាំងមាតិកាដែលមិនបានផ្សព្វផ្សាយទាំងអស់។</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve" approved="yes">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="final">ចាស/បាទលប់អក្នប្រើប្រាស់នេះ</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve" approved="yes">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="final">កែប្រែអ្នកប្រើ​ {០}</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve" approved="yes">
-				<source>Home</source>
+        <source>Home</source>
         <target state="final">ទំព័រដើម</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve" approved="yes">
-				<source>Work</source>
+        <source>Work</source>
         <target state="final">ការងារ</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve" approved="yes">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="final">គ្រប់​គ្រង​កញ្ចប់</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve" approved="yes">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="final">មុខងារនៃការគ្រប់គ្រងកញ្ចប់ផ្ដល់ឱ្យអ្នកនូវទិដ្ឋភាពទូទៅនៃកញ្ចប់ទាំងអស់។ អ្នកអាចធ្វើនិងអសកម្មកញ្ចប់បុគ្គល, បញ្ចូលកញ្ចប់ថ្មីនិងលុបកញ្ចប់ដែលមានស្រាប់ចោល។ វាក៏ផ្តល់ឱ្យអ្នកនូវសមត្ថភាពក្នុង freeze និង unfreeze កញ្ចប់នៅក្នុងបរិបទការអភិវឌ្ឍផងដែរ។</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve" approved="yes">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="final">កញ្ចប់អាចរកបាន</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve" approved="yes">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="final">ឈ្មោះកញ្ចប់</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve" approved="yes">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="final">គន្លឹះកញ្ចប់</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve" approved="yes">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="final">ប្រភេទកញ្ចប់</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve" approved="yes">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="final">ធ្វើឱ្យអសកម្ម</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve" approved="yes">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="final">កញ្ចប់នេះបច្ចុប្បន្នកំពុងជាប់គាំង។ ចុចដើម្បី unfreeze វា។</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve" approved="yes">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="final">បង្កកកញ្ចប់នៅក្នុងគោលបំណងដើម្បីបង្កើនល្បឿនគេហទំព័ររបស់អ្នក។</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve" approved="yes">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="final">កញ្ចប់នេះត្រូវបានការពារនិងមិនអាចត្រូវបានធ្វើឱ្យអសកម្ម។</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve" approved="yes">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="final">កញ្ចប់អសកម្ម</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve" approved="yes">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="final">ធ្វើឱ្យសកម្មកញ្ចប់</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve" approved="yes">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="final">កញ្ចប់នេះត្រូវបានការពារនិងមិនអាចត្រូវបានលុប។</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve" approved="yes">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="final">លុបកញ្ចប់</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="final">តើអ្នកពិតជាចង់លុប "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve" approved="yes">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="final">បាទ, លុបកញ្ចប់</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve" approved="yes">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="final">បាទ, លុបកញ្ចប់</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="final">តើអ្នកពិតជាចង់លុបកញ្ចប់ដែលបានជ្រើសឬ?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve" approved="yes">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="final">កញ្ចប់ដែលបានបង្កកដែលបានជ្រើសរើស</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve" approved="yes">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="final">Unfreeze កញ្ចប់ដែលបានជ្រើស</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve" approved="yes">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="final">លុបកញ្ចប់ដែលបានជ្រើស</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve" approved="yes">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="final">អសកម្មកញ្ចប់ដែលបានជ្រើស</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve" approved="yes">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="final">ធ្វើឱ្យសកម្មកញ្ចប់ដែលបានជ្រើស</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve" approved="yes">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="final">គ្រប់គ្រងគេហទំព័រ</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve" approved="yes">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="final">ម៉ូឌុលគេហទំព័រគ្រប់គ្រងផ្ដល់ឱ្យអ្នកនូវទិដ្ឋភាពទូទៅនៃតំបន់បណ្តាញទាំងអស់។ អ្នកអាចកែសម្រួលបន្ថែមនិងលុបអំពីវិបសាយដូចជាបន្ថែម domain​ ថ្មីរបស់អ្នក។</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="needs-translation">Add new site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve" approved="yes">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="final">បង្កើតវែបសាយ</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve" approved="yes">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="final">
 បង្កើតគេហទំព័រថ្មី</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="needs-translation">Root node name</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="needs-translation">Domains</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve" approved="yes">
-				<source>Site</source>
+        <source>Site</source>
         <target state="final">តំបន់បណ្តាញ</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve" approved="yes">
-				<source>Name</source>
+        <source>Name</source>
         <target state="final">ឈ្មោះ</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="needs-translation">Default asset collection</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="needs-translation">Site package</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="needs-translation">Delete this site</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="needs-translation">Deactivate site</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="needs-translation">Activate site</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="needs-translation">Yes, delete the site</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="needs-translation">Import a site</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="needs-translation">Select a site package</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="needs-translation">No site packages are available. Make sure you have an active site package.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="needs-translation">Create a blank site</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="needs-translation">Select a document nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="needs-translation">Site name</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="needs-translation">Create empty site</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="needs-translation">Create a new site package</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="needs-translation">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="needs-translation">No sites available</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The <em>Neos Kickstarter</em> package is not installed, install it to kickstart new sites.</source>
-        <target state="needs-translation">The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="needs-translation">New site</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="needs-translation">New domain</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="needs-translation">Edit domain</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="needs-translation">Domain data</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="needs-translation">e.g. www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="needs-translation">State</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="needs-translation">Create</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve" approved="yes">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="final">ការកំណត់រចនាសម្ព័ន្ធ</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve" approved="yes">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="final">មុខងារនៃការកំណត់រចនាសម្ព័ន្ធនេះបានផ្ដល់ឱ្យអ្នកនូវទិដ្ឋភាពទូទៅ នៃប្រភេទការកំណត់រចនាសម្ព័ន្ធទាំងអស់។</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve" approved="yes">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="final">
 វិមាត្រ</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="needs-translation">Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="needs-translation">Inter dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="needs-translation">Inter dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="needs-translation">The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
@@ -571,416 +555,396 @@ Primary fallbacks are marked blue and always visible, while lower priority fallb
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="needs-translation">Intra dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="needs-translation">Intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="needs-translation">The intra dimensional fallback graph displays fallbacks within each content dimension.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve" approved="yes">
-				<source>User</source>
+        <source>User</source>
         <target state="final">គណនី</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve" approved="yes">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="final">ការកំណត់អ្នកប្រើប្រាស់</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve" approved="yes">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="final">មុខងារនេះអនុញ្ញាតឱ្យអ្នកធ្វើការផ្លាស់ប្ដូរកម្មវិធីនៃផ្នែកខាងក្រោយរបស់អ្នកតាមបំណងនៃទម្រង់របស់អ្នកប្រើប្រាស់។ នៅទីនេះ អ្នកអាចផ្លាស់ប្តូរឈ្មោះរបស់អ្នក, ភាសាសកម្មរបស់ប្រព័ន្ធនិងអាស័យដ្ឋានអ៊ីមែល​ របស់អ្នក។ អ្នកអាចកំណត់រចនាសម្ព័ន្ធលក្ខណៈពិសេសទូទៅនៅក្នុងប្រព័ន្ធបាន។</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">កែប្រែ</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">កែប្រែ</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve" approved="yes">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="final">បង្កើតអាសយដ្ឋានថ្មី</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve" approved="yes">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="final">គណនីកែសម្រួល</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">ទិន្នន័យ​ផ្ទាល់​ខ្លួន</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve" approved="yes">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="final">ទិន្នន័យរប​ស់​អ្នក​ប្រើ​ប្រាស់</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve" approved="yes">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="final">ម៉ឺនុយរបស់អ្នកប្រើ</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve" approved="yes">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="final">ជម្រើស​ការប្រើប្រាស់​របស់​អ្នក​​ប្រើ​ប្រាស់​</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="final">ភាសារទំព័រមុខ</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">ប្រើប្រព័ន្ធលំនាំដើម</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve" approved="yes">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="final">គណនី</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">ឈ្មោះ​គណនី</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">តួនាទី</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve" approved="yes">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="final">ការផ្ដល់ការផ្ទៀងផ្ទាត់ត្រឹមត្រូវ</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve" approved="yes">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="final">អាស័យដ្ឋានអេឡិចត្រូនិច</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="final">តើអ្នកពិតជាចង់លុបមែនហ៎</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve" approved="yes">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="final">យល់ព្រមលុប អាស័យដ្ឋាន អេឡិចត្រូនិ</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve" approved="yes">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="final">ចុចដើម្បីបន្ថែមអាស័យដ្ឋានអេឡិចត្រូនិថ្មីមួយ</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve" approved="yes">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="final">បន្ថែមអាសយដ្ឋាន អេឡិចត្រូនិ</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve" approved="yes">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="final">រក្សាទុកអ្នកប្រើប្រាស់</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">កែ​ប្រែ​អ្ន​ក​ប្រើ​ប្រាស់​</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve" approved="yes">
-				<source>Update</source>
+        <source>Update</source>
         <target state="final">ទំនើបកម្ម</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">កែ​ប្រែ​អ្ន​ក​ប្រើ​ប្រាស់​</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/lv/Modules.xlf b/Neos.Neos/Resources/Private/Translations/lv/Modules.xlf
index ba18f8cbaba..e15896a73b9 100644
--- a/Neos.Neos/Resources/Private/Translations/lv/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/lv/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="lv">
     <body>
       <trans-unit id="back" xml:space="preserve" approved="yes">
-				<source>Back</source>
+        <source>Back</source>
         <target state="final">Atpakaļ</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve" approved="yes">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="final">Atcelt</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve" approved="yes">
-				<source>Management</source>
+        <source>Management</source>
         <target state="final">Vadība</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve" approved="yes">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="final">Satur vairākus moduļus, kas saistīti ar satura pārvaldību</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve" approved="yes">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="final">Administrācija</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve" approved="yes">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="final">Satur vairākus administrācijas moduļus</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve" approved="yes">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="final">Lietotāju pārvaldība</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve" approved="yes">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="final">Lietotāja pārvaldības modulis sniedz pārskatu par visiem sistēmas lietotājiem. Tos var grupēt pēc to atļaujām, pieslēgumiem, dalībnieku grupām utt. Šis modulis ir neaizstājams, lai konfigurētu lietotāju uzstādījumus.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve" approved="yes">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="final">Pārskats</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve" approved="yes">
-				<source>Show</source>
+        <source>Show</source>
         <target state="final">Rādīt</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve" approved="yes">
-				<source>New</source>
+        <source>New</source>
         <target state="final">Jauns</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Labot</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve" approved="yes">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="final">Rediģēt kontu</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve" approved="yes">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="final">Jaunā elektroniskā adrese</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Izmantot sistēmas noklusējumu</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve" approved="yes">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="final">Izveidot lietotāju</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve" approved="yes">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="final">Izveidot jaunu lietotāju</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve" approved="yes">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="final">Lietotāja dati</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Lietotājvārds</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve" approved="yes">
-				<source>Password</source>
+        <source>Password</source>
         <target state="final">Parole</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve" approved="yes">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="final">Atkārtot paroli</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve" approved="yes">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="final">Loma (s)</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve" approved="yes">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="final">Autentifikācijas sniedzējs</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Izmantot sistēmas noklusējumu</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Lietotāja informācija</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve" approved="yes">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="final">Vārds</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve" approved="yes">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="final">Uzvārds</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve" approved="yes">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="final">Lietotāja uzstādījumi</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="final">Vadības valoda</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve" approved="yes">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="final">Izveidot lietotāju</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve" approved="yes">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="final">Informācija lietotājam</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Lietotāja informācija</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve" approved="yes">
-				<source>Title</source>
+        <source>Title</source>
         <target state="final">Virsraksts</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve" approved="yes">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="final">Vārds</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve" approved="yes">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="final">Tēvvārds</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve" approved="yes">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="final">Uzvārds</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve" approved="yes">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="final">Cits nosaukums</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve" approved="yes">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="final">Konti</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Lietotājvārds</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Lomas</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve" approved="yes">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="final">Elektroniskās adreses</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve" approved="yes">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="final">Galvenais</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve" approved="yes">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="final">Nav datu</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve" approved="yes">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="final">Dzēst lietotāju</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Rediģēt lietotāju</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve" approved="yes">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="final">Ja esiet reģistrējies kā lietotājs, tad savus ievadītos datus jūs nevarat izdzēst.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve" approved="yes">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="final">Uzklikšķiniet šeit lai izdzēstu šo lietotāju</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="final">Vai tiešām vēlaties dzēst lietotāju "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve" approved="yes">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="final">Jā, dzēst lietotāju</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve" approved="yes">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="final">Tiks dzēsts lietotājs, saistītie konti un viņa personīgā darba virsma, ieskaitot visu nepublicētu saturu.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve" approved="yes">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="final">Šo darbību nevar atsaukt</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve" approved="yes">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="final">Rediģēt kontu "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve" approved="yes">
-				<source>Account</source>
+        <source>Account</source>
         <target state="final">Konts</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Lietotājvārds</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve" approved="yes">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="final">Lietotājvārdu nevar mainīt izmantojot lietotāja interfeisu</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve" approved="yes">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="final">Saglabāt kontu</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve" approved="yes">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="final">Atkārtot paroli</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Lomas</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="translated">Tieši piešķirta privilēģija</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve" approved="yes">
-				<source>Name</source>
+        <source>Name</source>
         <target state="final">Vārds</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve" approved="yes">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="final">Konti un lomas</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="translated">Skatīt lietotāju</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve" approved="yes">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="final">Rediģēt lietotāju</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="translated">Nepietiek tiesību rediģēt šo lietotāju</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="translated">Nav pietiekamu privilēģiju, lai dzēstu šo lietotāju</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve" approved="yes">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="final">Dzēst lietotāju</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve" approved="yes">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="final">Ja esiet reģistrējies kā lietotājs, tad savus ievadītos datus jūs nevarat izdzēst.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="final">Vai tiešām vēlaties dzēst lietotāju "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve" approved="yes">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="final">Tiks dzēsts lietotājs, saistītie konti un viņa personīgā darba virsma, ieskaitot visu nepublicētu saturu.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve" approved="yes">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="final">Jā, dzēst lietotāju</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve" approved="yes">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="final">Rediģēt lietotāju "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="translated">Sākumlapa</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve" approved="yes">
-				<source>Work</source>
+        <source>Work</source>
         <target state="final">Darbs</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve" approved="yes">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="final">Pakotnes pārvaldība</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve" approved="yes">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="final">Pakotnes vadības modulis sniedz pārskatu par visām pakotnēm. Ar to jūs varat aktivizēt un deaktivizēt pakotnes, importēt jaunas pakotnes un izdzēst esošās. Tas dod iespēju ieslēgt un izslēgt pakotnes izstrādes kontekstā.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve" approved="yes">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="final">Pieejamās pakotnes</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve" approved="yes">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="final">Pakotnes nosaukums</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve" approved="yes">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="final">Pakotnes atslēga</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve" approved="yes">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="final">Pakotnes tips</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="translated">Deaktivizēt</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve" approved="yes">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="final">Pašlaik šī pakotne ir iesaldēta. Noklikšķiniet lai atsaldētu.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve" approved="yes">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="final">Iesaldējiet paketi lai paātrinātu jūsu mājas lapas darbību.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve" approved="yes">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="final">Šī pakeotne ir aizsargāta un to nevar deaktivizēt.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve" approved="yes">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="final">Deaktivizēt pakotni</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve" approved="yes">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="final">Aktivizēt pakotni</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve" approved="yes">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="final">Šī pakotne ir aizsargāta un to nevar izdzēst.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve" approved="yes">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="final">Dzēst pakotni</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="final">Vai tiešām vēlaties dzēst "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve" approved="yes">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="final">Jā, dzēst pakotni</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve" approved="yes">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="final">Jā, dzēst pakotnes</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="final">Vai tiešām vēlaties dzēst iezīmētās pakotnes?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve" approved="yes">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="final">Iesaldēt atzīmētās pakotnes</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve" approved="yes">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="final">Atsaldēt atlasītās pakotnes</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve" approved="yes">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="final">Dzēst atzīmētās pakotnes</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve" approved="yes">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="final">Deaktivizēt atzīmētās pakotnes</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve" approved="yes">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="final">Aktivizēt atzīmētās pakotnes</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve" approved="yes">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="final">Vietņu pārvaldība</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve" approved="yes">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="final">Vietņu pārvaldības modulis sniedz apskatu par visām vietām. Jūs varat rediģēt, pievienot vai dzēst informāciju par jūsu vietnēm, piemēram, pievienojot jaunu domēnu.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="translated">Pievienot jaunu vietni</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve" approved="yes">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="final">Vietnes izveide</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve" approved="yes">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="final">Izveidot jaunu vietni</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="translated">Saknes mezgla nosaukums</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="translated">Domēns</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="translated">Vietne</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve" approved="yes">
-				<source>Name</source>
+        <source>Name</source>
         <target state="final">Vārds</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="translated">Noklusētā mediju kolekcija</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="translated">Vietnes pakotne</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="translated">Izdzēsiet šo vietni</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="translated">Deaktivizēt vietni</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="translated">Aktivizēt vietni</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Vai jūs tiešām vēlaties dzēst "{0}"? Šo darbību nav iespējams atsaukt.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="translated">Jā, dzēst vietni</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="translated">Importēt vietni</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="translated">Izvēlieties vietnes pakotni</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="translated">Nav pieejamas vietnes pakotnes. Pārliecinieties, vai jums ir aktīva vietnes pakotne.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="translated">Izveidot jaunu vietni</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="translated">Iezīmējiet dokumenta nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="translated">Izvēlieties vietnes ģeneratoru</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="translated">Vietnes nosaukums</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="translated">Izveidot tukšu vietni</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="translated">Izveidot jaunu vietnes pakotni</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="translated">Izstradatajs.ManaPakotnesAtslega</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="translated">Nav pieejama vietņu</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-        <target state="translated">&lt;em&gt;Neos Kickstarter&lt;/em&gt; pakotne nav instalēta, vispirms instalējiet to izmantojot kickstart komandu veidojot jaunu pakotni.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="translated">Jauna tīmekļa vietne</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Vai jūs tiešām vēlaties dzēst "{0}"? Šo darbību nav iespējams atsaukt.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="translated">Jauns domēns</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="translated">Rediģēt domēnu</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="translated">Domēna dati</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="translated">piemēram, www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="translated">Stāvoklis</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="translated">Izveidot</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve" approved="yes">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="final">Konfigurācija</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve" approved="yes">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="final">Iestatījuma modulis dod pārskatu par visiem iestatījuma veidiem.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve" approved="yes">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="final">Izmēri</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="translated">Piešķir grafisko pārskatu par konfigurētajiem elementu savienojumiem katrai satura dimensijai.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="translated">Elementu savstarpējo savienojumu diagramma</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="translated">Elementu ārējie savienojumi</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="translated">Elementu savstarpējo savienojumu diagrammas parāda iespējamos savienojumus starp papildelementiem (Satura dimensiju kombinācijas, kas parādīti kā mezgli).
@@ -569,420 +553,400 @@ Primārie elementu savienojumu iezīmēti zilā krāsā, mazākas prioritātes s
 Iezīmējiet vienu no mezgliem redzēsiet visus iespējamos elementu (mezglu) savienojumus. Uzklikšķiniet lai atceltu filtru.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="translated">Elementu savstarpējo savienojumu diagramma</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="translated">Elementu iekšējie savienojumi</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="translated">Satura dimensijas elementu savstarpējo savienojumu diagramma.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve" approved="yes">
-				<source>User</source>
+        <source>User</source>
         <target state="final">Lietotājs</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve" approved="yes">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="final">Lietotāja iestatījumi</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve" approved="yes">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="final">Šis modulis ļauj pielāgot redaktora lietotāja profilu. Šeit jūs varat mainīt aktīvo sistēmas valodu, vārdu un e-pasta adresi. Jūs varat konfigurēt arī citas iespējas sistēmā.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Labot</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Labot</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve" approved="yes">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="final">Jaunā elektroniskā adrese</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve" approved="yes">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="final">Rediģēt kontu</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Lietotāja informācija</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve" approved="yes">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="final">Lietotāja dati</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve" approved="yes">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="final">Lietotāja izvēlne</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve" approved="yes">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="final">Lietotāja uzstādījumi</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="final">Vadības valoda</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Izmantot sistēmas noklusējumu</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve" approved="yes">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="final">Konti</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Lietotājvārds</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Lomas</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve" approved="yes">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="final">Autentifikācijas sniedzējs</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve" approved="yes">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="final">Elektroniskās adreses</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="final">Vai tiešām vēlaties izdzēst</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve" approved="yes">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="final">Jā, dzēst elektronisko adresi</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve" approved="yes">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="final">Uzklikšķiniet, lai pievienotu jaunu elektronisko adresi</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve" approved="yes">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="final">Pievienot elektronisko adresi</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve" approved="yes">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="final">Saglabāt lietotāju</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Rediģēt lietotāju</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="translated">Konfigurācijas validācijas laikā radās kļūda.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="translated">Konfigurācijas veids nav atrasts.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="translated">Vietnes pakotne nav atrasta</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="translated">Vietnes pakotne "{0}" netika atrasta.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve" approved="yes">
-				<source>Update</source>
+        <source>Update</source>
         <target state="final">Atjaunināt</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="translated">Vietne "{0}" ir atjaunināta.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="translated">Trūkst pakotne</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="translated">Lai izveidotu jaunas vietnes pakotnes, ir nepieciešama pakotne "{0}".</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="translated">Nederīga "package key"</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="translated">Vietne tika importēta.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="translated">Importēšanas kļūda</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="translated">Kļūda: importējot "Vietnes.xml" no pakotnes "{0}", radās izņēmums: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="translated">Vietnes izveides kļūda</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="translated">Vietnes izveides kļūda</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="translated">Vietnes izveides kļūda</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Rediģēt lietotāju</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="users.lastLogin" xml:space="preserve">
-				<source>Last Login</source>
+        <source>Last Login</source>
         <target>Pēdējā pieteikšanās</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/nl/Modules.xlf b/Neos.Neos/Resources/Private/Translations/nl/Modules.xlf
index 38f5fd83d1e..669befc4a17 100644
--- a/Neos.Neos/Resources/Private/Translations/nl/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/nl/Modules.xlf
@@ -476,10 +476,6 @@
         <source>Select a document nodeType</source>
         <target state="translated">Selecteer een document nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-        <source>Select a site generator</source>
-        <target state="translated">Selecteer een site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
         <source>Site name</source>
         <target state="translated">Naam site</target>
@@ -488,22 +484,10 @@
         <source>Create empty site</source>
         <target state="translated">Maak een lege site</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-        <source>Create a new site package</source>
-        <target state="translated">Maak een nieuw site pakket aan</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-        <source>VendorName.MyPackageKey</source>
-        <target state="translated">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
         <source>No sites available</source>
         <target state="translated">Geen sites beschikbaar</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-        <source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-        <target state="translated">Het &lt;em&gt;Neos Kickstarter&lt;/em&gt; pakket is niet geïnstalleerd, installeer het om nieuwe sites te starten.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
         <source>New site</source>
         <target state="translated">Nieuwe site</target>
@@ -701,26 +685,6 @@ Hoe hoger de prioriteit, des te groter de ondoorzichtbaarheid. Klik op een van d
         <source>The site "{0}" has been updated.</source>
         <target state="translated">De site "{0}" is bijgewerkt.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-        <source>Missing Package</source>
-        <target state="translated">Ontbrekend pakket</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-        <source>The package "{0}" is required to create new site packages.</source>
-        <target state="translated">Het pakket "{0}" is benodigd om een nieuwe site pakket te kunnen maken.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-        <source>Invalid package key</source>
-        <target state="translated">Ongeldige pakketcode</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-        <source>The package key "{0}" already exists.</source>
-        <target state="translated">Sitepakket "{0}" bestaat al.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-        <source>Site package {0} was created.</source>
-        <target state="translated">Sitepakket "{0}" is aangemaakt.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
         <source>The site has been imported.</source>
         <target state="translated">De site is geïmporteerd.</target>
diff --git a/Neos.Neos/Resources/Private/Translations/no/Modules.xlf b/Neos.Neos/Resources/Private/Translations/no/Modules.xlf
index cbf6a6e2a6e..4288253f635 100644
--- a/Neos.Neos/Resources/Private/Translations/no/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/no/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="no">
     <body>
       <trans-unit id="back" xml:space="preserve">
-				<source>Back</source>
+        <source>Back</source>
         <target state="translated">Tilbake</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">Avbryt</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="translated">Administrasjon</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="translated">Inneholder flere moduler knyttet til administrasjon av innhold</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="translated">Administrasjon</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="translated">Inneholder flere moduler knyttet til administrasjon</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="translated">Brukeradministrasjon</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="translated">Brukeradministrasjon modulen gir deg en oversikt over alle backend-brukere. Du kan gruppere dem etter egenskaper slik at du kan overvåke tillatelsene, filområder, medlemsgrupper o.s.v. Denne modulen er et uunnværlig verktøy for å sikre at brukerne er riktig konfigurert.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="translated">Oversikt</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="translated">Vis</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="translated">Ny</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Rediger</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Rediger konto</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Nye elektronisk adresse</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Bruk systemstandard</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Opprett bruker</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="needs-translation">Create a new user</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Brukerdata</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Brukernavn</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">Passord</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Gjenta passord</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="translated">Roller</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">Autentiseringstjeneste</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Bruk systemstandard</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Personopplysninger</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Fornavn</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Etternavn</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">Brukerinnstillinger</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">Språk</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Opprett bruker</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="translated">Brukerdetaljer</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Personopplysninger</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">Tittel</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Fornavn</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="translated">Mellomnavn</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Etternavn</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="translated">Annet navn</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Kontoer</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Brukernavn</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Roller</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="translated">Elektroniske adresser</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="translated">Primært</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="translated">Ikke tilgjengelig</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="translated">Slett bruker</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Rediger bruker</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">Du er logget på som denne brukeren og du kan ikke slette deg selv.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="translated">Klikk her for å slette denne brukeren</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">Ønsker du virkelig å slette brukeren "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">Ja, slett brukeren</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">Dette vil slette brukeren, de relaterte kontoene og brukerens personlige arbeidsområde, inkludert alt upublisert innhold.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="translated">Denne operasjonen kan ikke angres</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="translated">Rediger kontoen "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="translated">Konto</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Brukernavn</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="translated">Brukernavnet kan ikke endres via brukergrensesnittet</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="translated">Lagre konto</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Gjenta passord</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Roller</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Navn</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="needs-translation">Accounts and Roles</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="needs-translation">View user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="needs-translation">Edit user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="needs-translation">Delete user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">Du er logget på som denne brukeren og du kan ikke slette deg selv.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">Ønsker du virkelig å slette brukeren "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">Dette vil slette brukeren, de relaterte kontoene og brukerens personlige arbeidsområde, inkludert alt upublisert innhold.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">Ja, slett brukeren</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="needs-translation">Edit user "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="needs-translation">Home</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="needs-translation">Work</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="translated">Pakkeadministrasjon</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="translated">Modulen Pakkeadministrasjon inneholder en oversikt over alle pakker. Du kan aktivere og deaktivere enkeltpakker, importere nye pakker og slette eksisterende pakker. Den gir deg også muligheten til å fryse og frigi pakker i utviklingssammenheng.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="needs-translation">Available packages</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="needs-translation">Package Name</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="needs-translation">Package Key</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="needs-translation">Package Type</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="needs-translation">Deactivated</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="needs-translation">This package is currently frozen. Click to unfreeze it.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="needs-translation">Freeze the package in order to speed up your website.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="needs-translation">This package is protected and cannot be deactivated.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="needs-translation">Deactivate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="needs-translation">Activate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="needs-translation">This package is protected and cannot be deleted.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="needs-translation">Delete Package</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="needs-translation">Do you really want to delete "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="needs-translation">Yes, delete the package</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="needs-translation">Yes, delete the packages</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="needs-translation">Do you really want to delete the selected packages?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="needs-translation">Freeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="needs-translation">Unfreeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="needs-translation">Delete selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="needs-translation">Deactivate selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="needs-translation">Activate selected packages</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="translated">Nettstedsadministrasjon</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="translated">Nettsteder-modulen gir deg en oversikt over alle nettsteder. Du kan redigere, legge til og slette informasjon om dine nettsteder, for eksempel legge til et nytt domene.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="needs-translation">Add new site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="translated">Opprett nettsted</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="translated">Opprett et nytt nettsted</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="needs-translation">Root node name</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="needs-translation">Domains</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="needs-translation">Site</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Navn</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="needs-translation">Default asset collection</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="needs-translation">Site package</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="needs-translation">Delete this site</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="needs-translation">Deactivate site</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="needs-translation">Activate site</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="needs-translation">Yes, delete the site</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="needs-translation">Import a site</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="needs-translation">Select a site package</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="needs-translation">No site packages are available. Make sure you have an active site package.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="needs-translation">Create a blank site</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="needs-translation">Select a document nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="needs-translation">Site name</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="needs-translation">Create empty site</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="needs-translation">Create a new site package</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="needs-translation">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="needs-translation">No sites available</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The <em>Neos Kickstarter</em> package is not installed, install it to kickstart new sites.</source>
-        <target state="needs-translation">The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="needs-translation">New site</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="needs-translation">New domain</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="needs-translation">Edit domain</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="needs-translation">Domain data</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="needs-translation">e.g. www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="needs-translation">State</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="needs-translation">Create</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="translated">Konfigurasjon</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="translated">Modulen Konfigurasjon gir deg en oversikt over alle konfigurasjonstyper.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="translated">Dimensjoner</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="needs-translation">Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="needs-translation">Inter dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="needs-translation">Inter dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="needs-translation">The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
@@ -569,416 +553,396 @@ Primary fallbacks are marked blue and always visible, while lower priority fallb
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="needs-translation">Intra dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="needs-translation">Intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="needs-translation">The intra dimensional fallback graph displays fallbacks within each content dimension.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="translated">Bruker</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="translated">Brukerinnstillinger</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="translated">Denne modulen lar deg tilpasse backend-brukerprofilen. Her kan du endre aktivt systemspråk, navn og e-postadresse. Du kan også konfigurere andre generelle funksjoner i systemet.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Rediger</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Rediger</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Nye elektronisk adresse</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Rediger konto</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Personopplysninger</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Brukerdata</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="translated">Brukermeny</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">Brukerinnstillinger</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">Språk</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Bruk systemstandard</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Kontoer</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Brukernavn</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Roller</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">Autentiseringstjeneste</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="translated">Elektroniske adresser</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="translated">Ønsker du virkelig å slette</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="translated">Ja, slett den elektroniske adressen</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="translated">Klikk for å legge til en ny elektronisk adresse</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="translated">Legg til en elektronisk adresse</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="translated">Lagre bruker</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Rediger bruker</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">Oppdater</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Rediger bruker</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/pl/Modules.xlf b/Neos.Neos/Resources/Private/Translations/pl/Modules.xlf
index 8c977c63c4f..335a38ddd63 100644
--- a/Neos.Neos/Resources/Private/Translations/pl/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/pl/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="pl">
     <body>
       <trans-unit id="back" xml:space="preserve" approved="yes">
-				<source>Back</source>
+        <source>Back</source>
         <target state="final">Wstecz</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve" approved="yes">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="final">Anuluj</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve" approved="yes">
-				<source>Management</source>
+        <source>Management</source>
         <target state="final">Zarządzanie</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve" approved="yes">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="final">Zawiera moduły do zarządzania treścią</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve" approved="yes">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="final">Administracja</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve" approved="yes">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="final">Zawiera mooduły związane z administracją</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve" approved="yes">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="final">Zarządzanie użytkownikami</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve" approved="yes">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="final">Moduł zarządzania użytkownikami umożliwia przegląd wszystkich back-end użytkowników. Można ich grupować wg. ich właściwości, dzięki czemu możesz monitorować ich uprawnienia, zamontowane systemy plików, członkostwa w grupach itp.. Moduł ten jest niezastąpionym narzędziem kiedy chcesz się upewnić, że użytkownicy są poprawnie skonfigurowani.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve" approved="yes">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="final">Podsumowanie</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve" approved="yes">
-				<source>Show</source>
+        <source>Show</source>
         <target state="final">Pokaż</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve" approved="yes">
-				<source>New</source>
+        <source>New</source>
         <target state="final">Nowy</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Edytuj</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve" approved="yes">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="final">Edytuj konto</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve" approved="yes">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="final">Nowy adres elektroniczny</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Użyj domyślnego w systemie</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve" approved="yes">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="final">Utwórz użytkownika</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve" approved="yes">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="final">Utwórz nowego użytkownika</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve" approved="yes">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="final">Dane użytkownika</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Użytkownik</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve" approved="yes">
-				<source>Password</source>
+        <source>Password</source>
         <target state="final">Hasło</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve" approved="yes">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="final">Powtórz hasło</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve" approved="yes">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="final">Role</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve" approved="yes">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="final">Dostawca uwierzytelnień</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Użyj domyślnego w systemie</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Dane personalne</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve" approved="yes">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="final">Imię</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve" approved="yes">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="final">Nazwisko</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve" approved="yes">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="final">Ustawienia użytkownika</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="final">Język interfejsu</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve" approved="yes">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="final">Utwórz użytkownika</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve" approved="yes">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="final">Szczegóły użytkownika</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Dane personalne</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve" approved="yes">
-				<source>Title</source>
+        <source>Title</source>
         <target state="final">Tytuł</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve" approved="yes">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="final">Imię</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve" approved="yes">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="final">Drugie imię</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve" approved="yes">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="final">Nazwisko</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve" approved="yes">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="final">Inna nazwa</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve" approved="yes">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="final">Konta</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Użytkownik</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Role</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve" approved="yes">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="final">Adresy elektroniczne</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve" approved="yes">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="final">Główny</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve" approved="yes">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="final">Niedostępne</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve" approved="yes">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="final">Usuń użytkownika</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Edytuj użytkownika</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve" approved="yes">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="final">Jesteś zalogowany jako ten użytkownik i nie możesz usunąć siebie.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve" approved="yes">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="final">Kliknij tutaj aby usunąć tego użytkownika</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="final">Czy naprawdę chcesz usunąć użytkownika "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve" approved="yes">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="final">Tak, usuń użytkownika</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve" approved="yes">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="final">Spowoduje to usunięcie użytkownika, powiązanych kont i jego osobistego obszaru roboczego, w tym wszystkich nieopublikowanych treści.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve" approved="yes">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="final">Tej operacji nie można cofnąć</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve" approved="yes">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="final">Edytuj konto "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve" approved="yes">
-				<source>Account</source>
+        <source>Account</source>
         <target state="final">Konto</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Użytkownik</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve" approved="yes">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="final">Nazwa użytkownika nie może zostać zmieniona za pomocą interfejsu użytkownika</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve" approved="yes">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="final">Zapisz konto</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve" approved="yes">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="final">Powtórz hasło</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Role</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve" approved="yes">
-				<source>Name</source>
+        <source>Name</source>
         <target state="final">Nazwa</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve" approved="yes">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="final">Konta i role</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve" approved="yes">
-				<source>View user</source>
+        <source>View user</source>
         <target state="final">Wyświetl użytkownika</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve" approved="yes">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="final">Edytuj użytkownika</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve" approved="yes">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="final">Usuń użytkownika</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve" approved="yes">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="final">Jesteś zalogowany jako ten użytkownik i nie możesz usunąć siebie.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="final">Czy naprawdę chcesz usunąć użytkownika "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve" approved="yes">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="final">Spowoduje to usunięcie użytkownika, powiązanych kont i jego osobistego obszaru roboczego, w tym wszystkich nieopublikowanych treści.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve" approved="yes">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="final">Tak, usuń użytkownika</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve" approved="yes">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="final">Edytuj użytkownika "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve" approved="yes">
-				<source>Home</source>
+        <source>Home</source>
         <target state="final">Domowy</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve" approved="yes">
-				<source>Work</source>
+        <source>Work</source>
         <target state="final">Firmowy</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve" approved="yes">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="final">Zarządzanie pakietami</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve" approved="yes">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="final">Moduł zarządzania pakietami umożliwia przeglądanie wszystkich pakietów. Pakiety można włączyć i wyłączyć, zaimportować nowe i usunąć istniejące. Istnieje także opcja zamrożenia i odmrożenia pakietów w kontekście rozwoju.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve" approved="yes">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="final">Dostępne pakiety</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve" approved="yes">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="final">Nazwa pakietu</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve" approved="yes">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="final">Klucz pakietu</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve" approved="yes">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="final">Typ pakietu</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve" approved="yes">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="final">Nieaktywny</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve" approved="yes">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="final">Ten pakiet jest obecnie zamrożony. Kliknij, aby go odmrozić.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve" approved="yes">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="final">Zamroź pakiet, aby przyspieszyć działanie Twojej strony.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve" approved="yes">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="final">Ten pakiet jest chroniony i nie może zostać dezaktywowany.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve" approved="yes">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="final">Dezaktywuj pakiet</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve" approved="yes">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="final">Aktywuj pakiet</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve" approved="yes">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="final">Ten pakiet jest chroniony i nie może zostać usunięty.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve" approved="yes">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="final">Usuń pakiet</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="final">Czy na pewno chcesz usunąć "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve" approved="yes">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="final">Tak, usuń pakiet</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve" approved="yes">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="final">Tak, usuń pakiety</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="final">Czy na pewno chcesz usunąć wybrane pakiety?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve" approved="yes">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="final">Zamroź wybrane pakiety</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve" approved="yes">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="final">Odmroź wybrane pakiety</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve" approved="yes">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="final">Usuń wybrane pakiety</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve" approved="yes">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="final">Dezaktywuj wybrane pakiety</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve" approved="yes">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="final">Aktywuj wybrane pakiety</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve" approved="yes">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="final">Zarządzanie stronami</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve" approved="yes">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="final">Moduł Zarządzania Stronami umożliwia przegląd wszystkich stron. Można edytować, dodawać i usuwać informacje o witrynach, takie jak przypisana domena.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve" approved="yes">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="final">Dodaj nową stronę</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve" approved="yes">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="final">Utwórz stronę</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve" approved="yes">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="final">Utwórz nową stronę</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve" approved="yes">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="final">Nazwa węzła głównego</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve" approved="yes">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="final">Domeny</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve" approved="yes">
-				<source>Site</source>
+        <source>Site</source>
         <target state="final">Strona</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve" approved="yes">
-				<source>Name</source>
+        <source>Name</source>
         <target state="final">Nazwa</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve" approved="yes">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="final">Domyślna kolekcja zasobów</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve" approved="yes">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="final">Pakiet strony</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve" approved="yes">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="final">Usuń tą stronę</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve" approved="yes">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="final">Deaktywuj stronę</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve" approved="yes">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="final">Aktywuj stronę</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="final">Czy na pewno chcesz usunąć "{0}"? Tej akcji nie można cofnąć.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve" approved="yes">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="final">Tak, usuń stronę</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve" approved="yes">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="final">Importuj stronę</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve" approved="yes">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="final">Wybierz pakiet strony</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve" approved="yes">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="final">Brak dostępnych pakietów stron. Upewnij się, że masz aktywny pakiet strony.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve" approved="yes">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="final">Utwórz pustą stronę</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve" approved="yes">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="final">Wybierz nodeType dokumentu</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve" approved="yes">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="final">Nazwa strony</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve" approved="yes">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="final">Utwórz pustą stronę</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve" approved="yes">
-				<source>Create a new site package</source>
-        <target state="final">Utwórz nowy pakiet strony</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve" approved="yes">
-				<source>VendorName.MyPackageKey</source>
-        <target state="final">NazwaTworcy.KluczMojegoPakietu</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve" approved="yes">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="final">Brak dostępnych stron</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve" approved="no">
-				<source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-        <target state="translated">Pakiet &lt;em&gt;Neos Kickstarter&lt;/em&gt; nie jest zainstalowany, zainstaluj go aby wygenerować nowe strony.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve" approved="yes">
-				<source>New site</source>
+        <source>New site</source>
         <target state="final">Nowa strona</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="final">Czy na pewno chcesz usunąć "{0}"? Tej akcji nie można cofnąć.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve" approved="yes">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="final">Nowa domena</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve" approved="yes">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="final">Edytuj domenę</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve" approved="yes">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="final">Dane domeny</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve" approved="yes">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="final">np. www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve" approved="yes">
-				<source>State</source>
+        <source>State</source>
         <target state="final">Stan</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve" approved="yes">
-				<source>Create</source>
+        <source>Create</source>
         <target state="final">Utwórz</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve" approved="yes">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="final">Konfiguracja</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve" approved="yes">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="final">Moduł konfiguracyjny umożliwia podgląd wszystkich typów konfiguracji.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve" approved="yes">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="final">Wymiary</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="needs-translation">Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="needs-translation">Inter dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="needs-translation">Inter dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="needs-translation">The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
@@ -569,416 +553,396 @@ Primary fallbacks are marked blue and always visible, while lower priority fallb
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="needs-translation">Intra dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="needs-translation">Intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="needs-translation">The intra dimensional fallback graph displays fallbacks within each content dimension.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve" approved="yes">
-				<source>User</source>
+        <source>User</source>
         <target state="final">Użytkownik</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve" approved="yes">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="final">Ustawienia</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve" approved="yes">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="final">Moduł ten pozwala na dostosowanie Twojego profilu użytkownika backendu. Możesz tutaj zmienić swój aktywny język systemu, nazwisko i adres e-mail. Możesz również skonfigurować inne ogólne parametry w systemie.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Edytuj</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Edytuj</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve" approved="yes">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="final">Nowy adres elektroniczny</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve" approved="yes">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="final">Edytuj konto</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Dane personalne</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve" approved="yes">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="final">Dane użytkownika</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve" approved="yes">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="final">Menu użytkownika</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve" approved="yes">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="final">Ustawienia użytkownika</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="final">Język interfejsu</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Użyj domyślnego w systemie</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve" approved="yes">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="final">Konta</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Użytkownik</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Role</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve" approved="yes">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="final">Dostawca uwierzytelnień</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve" approved="yes">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="final">Adresy elektroniczne</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="final">Czy na pewno chcesz usunąć</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve" approved="yes">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="final">Tak, usuń adres elektroniczny</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve" approved="yes">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="final">Kliknij, aby dodać nowy adres elektroniczny</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve" approved="yes">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="final">Dodaj adres elektroniczny</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve" approved="yes">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="final">Zapisz użytkownika</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Edytuj użytkownika</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve" approved="yes">
-				<source>Update</source>
+        <source>Update</source>
         <target state="final">Aktualizuj</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Edytuj użytkownika</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/pt/Modules.xlf b/Neos.Neos/Resources/Private/Translations/pt/Modules.xlf
index c52c09978d5..f6d4a382a97 100644
--- a/Neos.Neos/Resources/Private/Translations/pt/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/pt/Modules.xlf
@@ -476,10 +476,6 @@
         <source>Select a document nodeType</source>
         <target state="translated">Selecione um documento nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-        <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
         <source>Site name</source>
         <target state="translated">Nome do site</target>
@@ -488,23 +484,11 @@
         <source>Create empty site</source>
         <target state="translated">Criar um site vazio</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-        <source>Create a new site package</source>
-        <target state="translated">Criar um novo pacote de site</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-        <source>VendorName.MyPackageKey</source>
-        <target state="translated">Nomedofornecedor.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
         <source>No sites available</source>
         <target state="translated">
 Nenhum site disponível.</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-        <source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-        <target state="translated">O pacote &lt;em&gt;Neos Kickstarter&lt;/em&gt; não está instalado, instale-o para iniciar novos sites.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
         <source>New site</source>
         <target state="translated">Novo Sitio</target>
@@ -702,26 +686,6 @@ Clique em um dos nodes para ver apenas os seus fallbacks e variantes. Clique nov
         <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-        <source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-        <source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-        <source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-        <source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-        <source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
         <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
diff --git a/Neos.Neos/Resources/Private/Translations/pt_BR/Modules.xlf b/Neos.Neos/Resources/Private/Translations/pt_BR/Modules.xlf
index 8e36f0c72e0..f8390d87bc0 100644
--- a/Neos.Neos/Resources/Private/Translations/pt_BR/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/pt_BR/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="pt-BR">
     <body>
       <trans-unit id="back" xml:space="preserve">
-				<source>Back</source>
+        <source>Back</source>
         <target state="translated">Voltar</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">Cancelar</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="translated">Gerenciamento</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="translated">Contém vários módulos relacionados ao gerenciamento de conteúdo</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="translated">Administração</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="translated">Contém vários módulos relacionados a administração</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="translated">Gerenciamento de Usuários</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="translated">O módulo de gerenciamento de usuário fornece uma visão geral de todos os usuários de back-end. Você pode agrupá-los por suas propriedades, então você é capaz de monitorar suas permissões, arquivos, grupos de membros etc... Este módulo é uma ferramenta indispensável para garantir que os usuários estão configurados corretamente.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="translated">Resumo</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="translated">Mostrar</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="translated">Novo</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Editar</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Editar conta</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Novo endereço eletrônico</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Usar padrão do sistema</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Criar usuário</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="translated">Criar um novo usuário</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Dados do usuário</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Nome de Usuário</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">Senha</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Repetir a senha</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="translated">Função (ões)</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">Provedor de Autenticação</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Usar padrão do sistema</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Dados Pessoais</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Primeiro nome</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Sobrenome</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">Preferências do Usuário</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">Idioma da Interface</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Criar usuário</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="translated">Detalhes de usuário</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Dados Pessoais</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">Título</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Primeiro nome</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="translated">Nome do meio</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Sobrenome</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="translated">Outro nome</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Contas</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Nome de Usuário</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Funções de usuário</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="translated">Endereços Eletrônicos</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="translated">Primário</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="translated">N/D</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="translated">Excluir Usuário</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Editar Usuário</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">Você está logado como esse usuário e você não pode apagar-se.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="translated">Clique aqui para excluir este usuário</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">Você quer mesmo excluir o usuário "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">Sim, excluir o usuário</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">Isto irá apagar o usuário, as contas relacionadas e seu espaço de trabalho pessoal, incluindo todo conteúdo não publicado.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="translated">Esta operação não pode ser desfeita</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="translated">Editar conta "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="translated">Conta</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Nome de Usuário</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="translated">O nome de usuário não pode ser alterado através da interface de usuário</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="translated">Salvar conta</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Repetir a senha</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Funções de usuário</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Nome</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="translated">Contas e funções</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="translated">Visualizar usuário</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="translated">Editar usuário</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="translated">Excluir usuário</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">Você está logado como esse usuário e você não pode apagar-se.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">Você quer mesmo excluir o usuário "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">Isto irá apagar o usuário, as contas relacionadas e seu espaço de trabalho pessoal, incluindo todo conteúdo não publicado.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">Sim, excluir o usuário</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="translated">Editar usuário "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="translated">Início</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="translated">Trabalho</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="translated">Gerenciamento de Pacotes</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="translated">O módulo de gerenciamento de pacotes fornece uma visão geral de todos os pacotes. Você pode ativar e desativar os pacotes individuais, importar novos pacotes e excluir pacotes existentes. Também fornece a capacidade para congelar e descongelar pacotes no contexto de desenvolvimento.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="translated">Pacotes disponíveis</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="translated">Nome do pacote</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="translated">Chave de pacote</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="translated">Tipo de pacote</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="translated">Desativado</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="translated">Este pacote está atualmente congelado. Clique para descongelá-lo.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="translated">Congele o pacote para acelerar o seu site.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="translated">Este pacote está protegido e não pode ser desativado.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="translated">Desativar o pacote</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="translated">Ativar o pacote</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="translated">Este pacote está protegido e não pode ser excluído.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="translated">Excluir o pacote</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="translated">Você quer mesmo apagar "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="translated">Sim, apagar o pacote</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="translated">Sim, apagar os pacotes</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="translated">Deseja realmente apagar os pacotes selecionados?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="translated">Congelar os pacotes selecionados</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="translated">Descongelar os pacotes selecionados</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="translated">Apagar pacotes selecionados</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="translated">Desativar os pacotes selecionados</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="translated">Activar os pacotes selecionados</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="translated">Gerenciamento de Sites</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="translated">O módulo de gerenciamento de Sites fornece uma visão geral de todos os sites. Você pode editar, adicionar e excluir informações sobre seus sites, como a adição de um novo domínio.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="translated">Adicionar novo site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="translated">Criar site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="translated">Criar um novo site</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="translated">Nome do nó raiz</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="translated">Domínios</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="translated">Site</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Nome</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="translated">Coleção de ativos de padrão</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="translated">Pacote de site</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="translated">Excluir este site</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="translated">Desativar o site</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="translated">Ativar o site</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Você quer mesmo excluir "{0}"? Esta ação não pode ser desfeita.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="translated">Sim, excluir o site</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="translated">Importar um site</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="translated">Selecione um pacote de site</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="translated">Não há pacotes de site disponíveis. Verifique se que você tem um pacote de site ativo.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="translated">Criar um site em branco</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="translated">Selecione um tipo de nó de documento</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="translated">Nome do site</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="translated">Criar site vazio</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="translated">Criar um novo pacote de site</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="translated">NomeFornecedor.ChaveMeuPacote</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="translated">Nenhum site disponível</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-        <target state="translated">O &lt;em&gt;Neos Kickstarter&lt;/em&gt; pacote não está instalado, instale-o para alavancar novos sites.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="translated">Novo site</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Você quer mesmo excluir "{0}"? Esta ação não pode ser desfeita.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="translated">Novo domínio</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="translated">Editar domínio</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="translated">Dados de domínio</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="translated">ex: www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="translated">Estado</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="translated">Criar</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="translated">Configuração</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="translated">O módulo de configuração fornece uma visão geral de todos os tipos de configuração.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="translated">Dimensões</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="translated">Concede uma visão geral gráfica sobre os fallbacks configurados em cada dimensão de conteúdo e entre dimensões de conteúdo.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="translated">Fallback gráfico inter dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="translated">Inter dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="translated">O fallback gráfico inter dimensional exibe todas os fallbacks possíveis (exibidos como arestas) entre subgrafos (combinações de valor de dimensão do conteúdo, exibidos como nós).
@@ -569,416 +553,396 @@ Fallbacks primários são marcados em azul e sempre visíveis, enquanto fallback
 Clique em um dos nós para apenas ver seus fallbacks e variantes. Clique novamente para remover o filtro.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="translated">Fallback gráfico intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="translated">Intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="translated">O fallback gráfico intra dimensional exibe fallbacks dentro de cada dimensão de conteúdo.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="translated">Usuário</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="translated">Configurações de Usuário</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="translated">Este módulo permite que você personalize seu perfil de usuário de back-end. Aqui você pode alterar seu idioma do sistema, nome e endereço de e-mail. Você também pode configurar outras características gerais do sistema.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Editar</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Editar</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Novo endereço eletrônico</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Editar conta</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Dados Pessoais</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Dados do usuário</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="translated">Menu de usuário</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">Preferências do Usuário</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">Idioma da Interface</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Usar padrão do sistema</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Contas</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Nome de Usuário</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Funções de usuário</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">Provedor de Autenticação</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="translated">Endereços eletrônicos</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="translated">Deseja realmente excluir</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="translated">Sim, exclua o endereço eletrônico</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="translated">Clique para adicionar um novo endereço eletrônico</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="translated">Adicionar o endereço eletrônico</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="translated">Salvar Usuário</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Editar Usuário</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">Atualizar</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Editar Usuário</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/ru/Modules.xlf b/Neos.Neos/Resources/Private/Translations/ru/Modules.xlf
index f7b900ecb65..15b956f4dfa 100644
--- a/Neos.Neos/Resources/Private/Translations/ru/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/ru/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="ru">
     <body>
       <trans-unit id="back" xml:space="preserve" approved="yes">
-				<source>Back</source>
+        <source>Back</source>
         <target state="final">Назад</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve" approved="yes">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="final">Отмена</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve" approved="yes">
-				<source>Management</source>
+        <source>Management</source>
         <target state="final">Управление</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve" approved="yes">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="final">Содержит модули управления содержимым</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve" approved="yes">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="final">Администрирование</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve" approved="yes">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="final">Содержит модули администрирования</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve" approved="yes">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="final">Управление пользователями</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve" approved="yes">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="final">Модуль управления пользователями даёт представление о всех пользователях в системе. Можно группировать их по свойствам для облегчения контроля их прав, точек доступа, принадлежности к группам и т.п.. Это незаменимый инструмент для контроля настроек пользователей.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve" approved="yes">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="final">Обзор</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve" approved="yes">
-				<source>Show</source>
+        <source>Show</source>
         <target state="final">Показать</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve" approved="yes">
-				<source>New</source>
+        <source>New</source>
         <target state="final">Создать</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Редактировать</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve" approved="yes">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="final">Изменить учетную запись</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve" approved="yes">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="final">Новый электронный адрес</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Установки по умолчанию</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve" approved="yes">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="final">Создать пользователя</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve" approved="yes">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="final">Создать нового пользователя</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve" approved="yes">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="final">Данные пользователя</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Имя пользователя</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve" approved="yes">
-				<source>Password</source>
+        <source>Password</source>
         <target state="final">Пароль</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve" approved="yes">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="final">Повторите пароль</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve" approved="yes">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="final">Роли</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve" approved="yes">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="final">Поставщик проверки подлинности</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Установки по умолчанию</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Личные данные</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve" approved="yes">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="final">Имя</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve" approved="yes">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="final">Фамилия</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve" approved="yes">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="final">Настройки пользователя</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="final">Язык интерфейса</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve" approved="yes">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="final">Создать пользователя</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve" approved="yes">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="final">Подробная информация для пользователя</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Личные данные</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve" approved="yes">
-				<source>Title</source>
+        <source>Title</source>
         <target state="final">Название</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve" approved="yes">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="final">Имя</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve" approved="yes">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="final">Отчество</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve" approved="yes">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="final">Фамилия</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve" approved="yes">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="final">Другая часть имени</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve" approved="yes">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="final">Учётные записи</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Имя пользователя</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Роли</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve" approved="yes">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="final">Электронные адреса</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve" approved="yes">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="final">Основной</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve" approved="yes">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="final">Н/Д</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve" approved="yes">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="final">Удалить пользователя</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Редактирование пользователя</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve" approved="yes">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="final">Вы вошли как пользователь, и вы не можете удалить сами себя.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve" approved="yes">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="final">Нажмите здесь, чтобы удалить этого пользователя</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="final">Вы действительно хотите удалить пользователя "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve" approved="yes">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="final">Да, удалить пользователя</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve" approved="yes">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="final">Это удалит пользователя, все связанные учетные записи и личные рабочие области, включая неопубликованные изменения.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve" approved="yes">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="final">Эта операция не может быть отменена</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve" approved="yes">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="final">Редактировать учетную запись "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve" approved="yes">
-				<source>Account</source>
+        <source>Account</source>
         <target state="final">Учетная запись</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Имя пользователя</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve" approved="yes">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="final">Имя пользователя не может быть изменено через пользовательский интерфейс</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve" approved="yes">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="final">Сохранить учетную запись</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve" approved="yes">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="final">Повторите пароль</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Роли</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve" approved="yes">
-				<source>Name</source>
+        <source>Name</source>
         <target state="final">Имя</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve" approved="yes">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="final">Учетные записи и роли</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve" approved="yes">
-				<source>View user</source>
+        <source>View user</source>
         <target state="final">Просмотр пользователя</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve" approved="yes">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="final">Редактировать учётную запись пользователя</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve" approved="yes">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="final">Удалить учётную запись пользователя</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve" approved="yes">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="final">Вы вошли как пользователь, и вы не можете удалить сами себя.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="final">Вы действительно хотите удалить пользователя "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve" approved="yes">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="final">Это удалит пользователя, все связанные учетные записи и личные рабочие области, включая неопубликованные изменения.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve" approved="yes">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="final">Да, удалить пользователя</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve" approved="yes">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="final">Редактирование учетной записи пользователя "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve" approved="yes">
-				<source>Home</source>
+        <source>Home</source>
         <target state="final">Домой</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve" approved="yes">
-				<source>Work</source>
+        <source>Work</source>
         <target state="final">Рабочий</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve" approved="yes">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="final">Управление пакетами</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve" approved="yes">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="final">Модуль управления пакетами даёт представление обо всех пакетах. Отдельные пакеты можно активировать или отключить, импортировать новые или удалить существующие. Также имеется возможность заморозить и разморозить пакеты в контексте разработки.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve" approved="yes">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="final">Доступные пакеты</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve" approved="yes">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="final">Название пакета</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve" approved="yes">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="final">Ключ пакета</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve" approved="yes">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="final">Тип пакета</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve" approved="yes">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="final">Деактивирован</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve" approved="yes">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="final">Этот пакет в настоящее время заморожен. Нажмите, чтобы разморозить его.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve" approved="yes">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="final">Заморозить пакет для того, чтобы ускорить ваш веб-сайт.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve" approved="yes">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="final">Этот пакет является защищенным и не может быть деактивирован.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve" approved="yes">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="final">Деактивировать пакет</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve" approved="yes">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="final">Активировать пакет</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve" approved="yes">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="final">Этот пакет защищён и не может быть удален.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve" approved="yes">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="final">Удалить пакет</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="final">Вы действительно хотите удалить "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve" approved="yes">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="final">Да, удалить пакет</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve" approved="yes">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="final">Да, удалить пакеты</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="final">Вы действительно хотите удалить выбранные пакеты?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve" approved="yes">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="final">Заморозить выбранные пакеты</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve" approved="yes">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="final">Разморозить выбранные пакеты</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve" approved="yes">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="final">Удалить выбранные пакеты</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve" approved="yes">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="final">Отключить выбранные пакеты</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve" approved="yes">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="final">Активировать выбранные пакеты</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve" approved="yes">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="final">Управление сайтами</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve" approved="yes">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="final">Модуль управления сайтами даёт представление обо всех сайтах. Можно редактировать, добавлять и удалять информацию о сайтах, например добавить новый домен.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve" approved="yes">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="final">Добавить новый сайт</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve" approved="yes">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="final">Создать сайт</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve" approved="yes">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="final">Создать новый сайт</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve" approved="yes">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="final">Имя корневого элемента</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve" approved="yes">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="final">Домены</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve" approved="yes">
-				<source>Site</source>
+        <source>Site</source>
         <target state="final">Сайт</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve" approved="yes">
-				<source>Name</source>
+        <source>Name</source>
         <target state="final">Имя</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve" approved="yes">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="final">Коллекция медиа-ресурсов по умолчанию</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve" approved="yes">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="final">Пакет сайта</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve" approved="yes">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="final">Удалить этот сайт</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve" approved="yes">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="final">Отключить сайт</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve" approved="yes">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="final">Включить сайт</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="final">Вы действительно хотите удалить "{0}"? Это действие безвозвратное.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve" approved="yes">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="final">Да, удалить сайт</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve" approved="yes">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="final">Импортировать сайт</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve" approved="yes">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="final">Выберите пакет сайта</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve" approved="yes">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="final">Нет пакетов сайтов. Убедитесь, что у вас есть пакет с активным сайтом.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve" approved="yes">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="final">Создать пустой сайт</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve" approved="yes">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="final">Выберите документ nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve" approved="yes">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="final">Название сайта</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve" approved="yes">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="final">Создать пустой сайт</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve" approved="yes">
-				<source>Create a new site package</source>
-        <target state="final">Создать новый пакет сайта</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve" approved="yes">
-				<source>VendorName.MyPackageKey</source>
-        <target state="final">НазваниеФирмы.КолонтитулПакета</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve" approved="yes">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="final">Нет доступных сайтов</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve" approved="no">
-				<source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-        <target state="translated">Пакет &lt;em&gt;Neos Kickstarter&lt;/em&gt; не установлен, установите его для кикстарта новых сайтов.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve" approved="yes">
-				<source>New site</source>
+        <source>New site</source>
         <target state="final">Создать сайт</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="final">Вы действительно хотите удалить "{0}"? Это действие безвозвратное.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve" approved="yes">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="final">Новый домен</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve" approved="yes">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="final">Править домен</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve" approved="yes">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="final">Данные домена</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve" approved="yes">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="final">например www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve" approved="yes">
-				<source>State</source>
+        <source>State</source>
         <target state="final">Состояние</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve" approved="yes">
-				<source>Create</source>
+        <source>Create</source>
         <target state="final">Создать</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve" approved="yes">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="final">Конфигурация</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve" approved="yes">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="final">Модуль Конфигурации предоставляет вам обзор всех типов конфигурации.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve" approved="yes">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="final">Размеры</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve" approved="yes">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="final">Предоставляет графический обзор настроек резервного поведения внутри одного измерения контента и между ними.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve" approved="yes">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="final">Междименсиональная диаграмма резервного поведения</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve" approved="yes">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="final">Междименсиональные</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve" approved="yes">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="final">Междименсиональная диаграмма резервного поведения отображает все возможные поведения(изображены как грани) между вложенными диаграммами(изображены как элементы).
@@ -569,416 +553,396 @@ Click on one of the nodes to only see its fallbacks and variants. Click again to
 Щёлкните на одно из измерений, чтобы увидеть только его резервные поведения и варианты. Щёлкните снова, чтобы удалить этот фильтр.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve" approved="yes">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="final">Внутри-дименсиональная диаграмма резервного поведения</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve" approved="yes">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="final">Внутри-дименсиональные</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve" approved="yes">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="final">Внутри-дименсиональная диаграмма отображает резервные поведения в рамках одного измерения контента.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve" approved="yes">
-				<source>User</source>
+        <source>User</source>
         <target state="final">Пользователь</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve" approved="yes">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="final">Мои настройки</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve" approved="yes">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="final">Этот модуль позволяет вам настроить ваш профиль пользователя. Здесь вы можете изменить ваш активный системный язык, имя и адрес электронной почты. Здесь вы также можете настроить другие функции системы.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Редактировать</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve" approved="yes">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="final">Редактировать</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve" approved="yes">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="final">Новый электронный адрес</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve" approved="yes">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="final">Изменить учетную запись</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve" approved="yes">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="final">Личные данные</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve" approved="yes">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="final">Данные пользователя</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve" approved="yes">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="final">Меню пользователя</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve" approved="yes">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="final">Настройки пользователя</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="final">Язык интерфейса</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve" approved="yes">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="final">Установки по умолчанию</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve" approved="yes">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="final">Учётные записи</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve" approved="yes">
-				<source>Username</source>
+        <source>Username</source>
         <target state="final">Имя пользователя</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve" approved="yes">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="final">Роли</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve" approved="yes">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="final">Поставщик проверки подлинности</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve" approved="yes">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="final">Электронные адреса</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve" approved="yes">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="final">Вы действительно хотите удалить</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve" approved="yes">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="final">Да, удалить электронный адрес</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve" approved="yes">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="final">Нажмите, чтобы добавить новый электронный адрес</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve" approved="yes">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="final">Добавить электронный адрес</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve" approved="yes">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="final">Сохранить Пользователя</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Редактирование пользователя</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve" approved="yes">
-				<source>Update</source>
+        <source>Update</source>
         <target state="final">Обновить</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve" approved="yes">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="final">Редактирование пользователя</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/sr/Modules.xlf b/Neos.Neos/Resources/Private/Translations/sr/Modules.xlf
index 1d233343d05..0222c228d4b 100644
--- a/Neos.Neos/Resources/Private/Translations/sr/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/sr/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="sr">
     <body>
       <trans-unit id="back" xml:space="preserve">
-				<source>Back</source>
+        <source>Back</source>
         <target state="needs-translation">Back</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">Откажи</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="needs-translation">Management</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="needs-translation">Contains multiple modules related to management of content</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="needs-translation">Administration</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="needs-translation">Contains multiple modules related to administration</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="needs-translation">User Management</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="needs-translation">The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="needs-translation">Overview</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="needs-translation">Show</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="needs-translation">New</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Измени</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="needs-translation">Edit account</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="needs-translation">New electronic address</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="needs-translation">Use system default</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="needs-translation">Create user</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="needs-translation">Create a new user</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="needs-translation">User Data</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Корисничко име</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">Лозинка</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="needs-translation">Repeat password</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="needs-translation">Role(s)</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="needs-translation">Authentication Provider</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="needs-translation">Use system default</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="needs-translation">Personal Data</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Име</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Презиме</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="needs-translation">User Preferences</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="needs-translation">Interface Language</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="needs-translation">Create user</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="needs-translation">Details for user</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="needs-translation">Personal Data</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">Наслов</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Име</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="translated">Средње име</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Презиме</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="translated">Друго име</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="needs-translation">Accounts</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Корисничко име</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="needs-translation">Electronic Addresses</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="translated">Osnovno</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="needs-translation">N/A</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="needs-translation">Delete User</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="needs-translation">Edit User</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="needs-translation">You are logged in as this user and you cannot delete yourself.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="needs-translation">Click here to delete this user</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="needs-translation">Do you really want to delete the user "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="needs-translation">Yes, delete the user</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="needs-translation">This will delete the user, the related accounts and his personal workspace, including all unpublished content.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="needs-translation">This operation cannot be undone</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="needs-translation">Edit account "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="needs-translation">Account</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Корисничко име</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="needs-translation">The username can't be changed via the user interface</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="needs-translation">Save account</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="needs-translation">Repeat password</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="needs-translation">Name</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="needs-translation">Accounts and Roles</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="needs-translation">View user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="needs-translation">Edit user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="needs-translation">Delete user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="needs-translation">You are logged in as this user and you cannot delete yourself.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="needs-translation">Do you really want to delete the user "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="needs-translation">This will delete the user, the related accounts and his personal workspace, including all unpublished content.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="needs-translation">Yes, delete the user</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="needs-translation">Edit user "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="needs-translation">Home</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="needs-translation">Work</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="needs-translation">Package Management</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="needs-translation">The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="needs-translation">Available packages</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="needs-translation">Package Name</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="needs-translation">Package Key</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="needs-translation">Package Type</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="needs-translation">Deactivated</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="needs-translation">This package is currently frozen. Click to unfreeze it.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="needs-translation">Freeze the package in order to speed up your website.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="needs-translation">This package is protected and cannot be deactivated.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="needs-translation">Deactivate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="needs-translation">Activate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="needs-translation">This package is protected and cannot be deleted.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="needs-translation">Delete Package</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="needs-translation">Do you really want to delete "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="needs-translation">Yes, delete the package</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="needs-translation">Yes, delete the packages</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="needs-translation">Do you really want to delete the selected packages?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="needs-translation">Freeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="needs-translation">Unfreeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="needs-translation">Delete selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="needs-translation">Deactivate selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="needs-translation">Activate selected packages</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="needs-translation">Sites Management</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="needs-translation">The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="needs-translation">Add new site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="needs-translation">Create site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="needs-translation">Create a new site</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="needs-translation">Root node name</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="needs-translation">Domains</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="needs-translation">Site</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="needs-translation">Name</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="needs-translation">Default asset collection</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="needs-translation">Site package</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="needs-translation">Delete this site</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="needs-translation">Deactivate site</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="needs-translation">Activate site</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="needs-translation">Yes, delete the site</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="needs-translation">Import a site</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="needs-translation">Select a site package</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="needs-translation">No site packages are available. Make sure you have an active site package.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="needs-translation">Create a blank site</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="needs-translation">Select a document nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="needs-translation">Site name</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="needs-translation">Create empty site</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="needs-translation">Create a new site package</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="needs-translation">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="needs-translation">No sites available</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The <em>Neos Kickstarter</em> package is not installed, install it to kickstart new sites.</source>
-        <target state="needs-translation">The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="needs-translation">New site</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="needs-translation">New domain</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="needs-translation">Edit domain</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="needs-translation">Domain data</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="needs-translation">e.g. www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="needs-translation">State</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="needs-translation">Create</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="needs-translation">Configuration</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="needs-translation">The Configuration module provides you with an overview of all configuration types.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="needs-translation">Dimensions</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="needs-translation">Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="needs-translation">Inter dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="needs-translation">Inter dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="needs-translation">The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
@@ -569,416 +553,396 @@ Primary fallbacks are marked blue and always visible, while lower priority fallb
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="needs-translation">Intra dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="needs-translation">Intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="needs-translation">The intra dimensional fallback graph displays fallbacks within each content dimension.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="needs-translation">User</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="needs-translation">User Settings</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="needs-translation">This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Измени</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Измени</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="needs-translation">New electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="needs-translation">Edit account</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="needs-translation">Personal Data</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="needs-translation">User Data</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="needs-translation">User Menu</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="needs-translation">User Preferences</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="needs-translation">Interface Language</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="needs-translation">Use system default</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="needs-translation">Accounts</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Корисничко име</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="needs-translation">Authentication Provider</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="needs-translation">Electronic addresses</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="needs-translation">Do you really want to delete</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="needs-translation">Yes, delete electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="needs-translation">Click to add a new Electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="needs-translation">Add electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="needs-translation">Save User</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="needs-translation">Edit User</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">Ажурирај</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="needs-translation">Edit User</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/sv/Modules.xlf b/Neos.Neos/Resources/Private/Translations/sv/Modules.xlf
index a5ec837207e..e788e26785c 100644
--- a/Neos.Neos/Resources/Private/Translations/sv/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/sv/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="sv-SE">
     <body>
       <trans-unit id="back" xml:space="preserve">
-				<source>Back</source>
+        <source>Back</source>
         <target state="translated">Tillbaka</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">Avbryt</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="translated">Hantering</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="translated">Innehåller flera moduler relaterade till innehållshantering</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="translated">Administrering</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="translated">Innehåller flera moduler för administrering</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="translated">Användarhantering</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="translated">Modulen Användarhantering ger dig en översikt över alla backend användare. Du kan gruppera dem enligt deras egenskaper så kan du övervaka deras behörigheter, filkvota, medlemsgrupper etc. Denna modul är ett oumbärligt verktyg för att se till att användarna är korrekt konfigurerade.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="translated">Översikt</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="translated">Visa</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="translated">Ny</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Redigera</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Redigera konto</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Ny e-postadress</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Använd systemstandard</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Skapa användare</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="translated">Skapa en ny användare</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Användardata</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Användarnamn</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">Lösenord</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Upprepa lösenordet</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="translated">Roll(er)</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">Autentiseringstjänst</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Använd systemstandard</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Personlig data</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Förnamn</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Efternamn</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">Användarinställningar</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">Språk för gränssnittet</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Skapa användare</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="translated">Detaljer för användaren</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Personlig data</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">Titel</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Förnamn</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="translated">Mellannamn</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Efternamn</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="translated">Annat namn</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Konton</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Användarnamn</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Roller</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="translated">Elektroniska adresser</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="translated">Primärt</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="translated">Ej tillgängligt</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="translated">Radera användare</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Redigera användare</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">Du är inloggad som denna användare och kan inte ta bort dig själv.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="translated">Klicka här för att radera denna användaren</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">Vill du verkligen ta bort användaren "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">Ja, ta bort användaren</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">Detta tar bort användaren, relaterade konton och dennes personliga arbetsyta, inklusive alla opublicerade innehåll.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="translated">Detta går ej att ångra</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="translated">Redigera kontot "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="translated">Konto</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Användarnamn</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="translated">Användarnamnet kan ej ändras via användargränssnittet</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="translated">Spara kontot</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Upprepa lösenordet</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Roller</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Namn</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="translated">Konton och roller</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="translated">Visa användare</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="translated">Redigera användare</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="translated">Radera användare</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">Du är inloggad som denna användare och kan inte ta bort dig själv.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">Vill du verkligen ta bort användaren "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">Detta tar bort användaren, relaterade konton och dennes personliga arbetsyta, inklusive alla opublicerade innehåll.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">Ja, ta bort användaren</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="translated">Redigera användaren "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="translated">Hem</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="translated">Jobb</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="translated">Pakethantering</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="translated">Pakethanteringsmodulen ger dig en översikt över alla paket. Du kan aktivera och deaktivera enskilda paket, importera nya paket och ta bort befintliga paket. Det ger dig också möjligheten att frysa och frigöra paket i utvecklingssammanhang.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="translated">Tillgängliga paket</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="translated">Paketnamn</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="translated">Paketnyckel</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="translated">Pakettyp</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="translated">Deaktiverat</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="translated">Detta paket är för närvarande fryst. Klicka för att frigöra det.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="translated">Frysa paketet för att snabba upp din webbplats.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="translated">Detta paket är skyddat och kan ej deaktiveras.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="translated">Deaktivera paketet</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="translated">Aktivera paketet</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="translated">Detta paket är skyddat och kan ej raderas.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="translated">Radera paketet</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="translated">Vill du verkligen radera "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="translated">Ja, radera paketet</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="translated">Ja, radera paketen</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="translated">Vill du verkligen radera de valda paketen?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="translated">Frys de valda paketen</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="translated">Frigör de valda paketen</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="translated">Radera de valda paketen</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="translated">Deaktivera de valda paketen</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="translated">Aktivera de valda paketen</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="translated">Hantering av webbplatser</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="translated">Modulen för hantering av webbplatser ger dig en översikt av alla webbplatser. Du kan redigera, lägga till och radera information om dina platser, till exempel lägga till en ny domän.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="translated">Lägg till ny sida</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="translated">Skapa webbplats</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="translated">Skapa en ny webbplats</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="translated">Rootnodsnamn</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="translated">Domäner</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="translated">Sida</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Namn</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="translated">Standardtillgångssamling</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="translated">Sid-paket</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="translated">Radera denna sida</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="translated">Inaktivera sida</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="translated">Aktivera sida</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Är du säker på att du vill radera "{0}"? Denna åtegärd går inte att ångra.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="translated">Ja, radera denna sida</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="translated">Importera en sida</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="translated">Välj sidpaket</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="translated">Inga sidpaket är tillgängliga. Se till att du har ett aktivt sidpaket.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="translated">Skapa tom sida</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="translated">Välj dokumentnodtyp</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="translated">Sidnamn</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="translated">Skapa tom sida</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="translated">Skapa nytt sidpaket</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="translated">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="translated">Inga webbplatser tillgängliga</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-        <target state="translated">&lt;em&gt;Neos Kickstarter&lt;/em&gt; paket är inste installerat. Installera det för att snabbstarta nya sidor.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="translated">Ny sajt</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Är du säker på att du vill radera "{0}"? Denna åtegärd går inte att ångra.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="translated">Ny domän</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="translated">Ändra domän</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="translated">Domändata</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="translated">t.ex. www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="translated">Tillstånd</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="translated">Skapa</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="translated">Konfiguration</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="translated">Modulen konfiguration ger dig en översikt över alla konfigurationstyper.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="translated">Dimensioner</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="needs-translation">Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="needs-translation">Inter dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="needs-translation">Inter dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="needs-translation">The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
@@ -569,416 +553,396 @@ Primary fallbacks are marked blue and always visible, while lower priority fallb
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="needs-translation">Intra dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="needs-translation">Intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="needs-translation">The intra dimensional fallback graph displays fallbacks within each content dimension.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="translated">Användare</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="translated">Användarinställningar</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="translated">Med denna modul kan du anpassa användarprofilens backend. Här kan du ändra ditt aktiva systemspråk, namn och e-postadress. Du kan också konfigurera andra allmänna funktioner i systemet.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Redigera</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Redigera</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Ny e-postadress</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Redigera konto</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Personlig data</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Användardata</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="translated">Användarmeny</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">Användarinställningar</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">Språk för gränssnittet</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Använd systemstandard</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Konton</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Användarnamn</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Roller</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">Autentiseringstjänst</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="translated">E-postadresser</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="translated">Vill du verkligen radera</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="translated">Ja, ta bort e-postadress</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="translated">Klicka för att lägga till en ny e-postadress</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="translated">Lägg till e-postadress</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="translated">Spara användare</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Redigera användare</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">Uppdatera</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Redigera användare</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/tl_PH/Modules.xlf b/Neos.Neos/Resources/Private/Translations/tl_PH/Modules.xlf
index 3da703d0a06..9aa32ecb846 100644
--- a/Neos.Neos/Resources/Private/Translations/tl_PH/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/tl_PH/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="tl">
     <body>
       <trans-unit id="back" xml:space="preserve" approved="yes">
-				<source>Back</source>
+        <source>Back</source>
         <target state="final">Ibalik</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">Kanselahin</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="needs-translation">Management</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="needs-translation">Contains multiple modules related to management of content</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="needs-translation">Administration</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="needs-translation">Contains multiple modules related to administration</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="needs-translation">User Management</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="needs-translation">The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="needs-translation">Overview</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="needs-translation">Show</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="needs-translation">New</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Edit</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="needs-translation">Edit account</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="needs-translation">New electronic address</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="needs-translation">Use system default</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="needs-translation">Create user</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="needs-translation">Create a new user</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="needs-translation">User Data</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Username</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">Password</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="needs-translation">Repeat password</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="needs-translation">Role(s)</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="needs-translation">Authentication Provider</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="needs-translation">Use system default</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="needs-translation">Personal Data</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="needs-translation">First Name</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="needs-translation">Last Name</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="needs-translation">User Preferences</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="needs-translation">Interface Language</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="needs-translation">Create user</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="needs-translation">Details for user</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="needs-translation">Personal Data</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">Pamagat</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="needs-translation">First Name</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="needs-translation">Middle Name</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="needs-translation">Last Name</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="needs-translation">Other Name</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="needs-translation">Accounts</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Username</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="needs-translation">Electronic Addresses</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="needs-translation">Primary</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="translated">N/A</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="needs-translation">Delete User</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="needs-translation">Edit User</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="needs-translation">You are logged in as this user and you cannot delete yourself.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="needs-translation">Click here to delete this user</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="needs-translation">Do you really want to delete the user "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="needs-translation">Yes, delete the user</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="needs-translation">This will delete the user, the related accounts and his personal workspace, including all unpublished content.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="needs-translation">This operation cannot be undone</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="needs-translation">Edit account "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="needs-translation">Account</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Username</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="needs-translation">The username can't be changed via the user interface</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="needs-translation">Save account</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="needs-translation">Repeat password</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Pangalan</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="needs-translation">Accounts and Roles</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="needs-translation">View user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="needs-translation">Edit user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="needs-translation">Delete user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="needs-translation">You are logged in as this user and you cannot delete yourself.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="needs-translation">Do you really want to delete the user "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="needs-translation">This will delete the user, the related accounts and his personal workspace, including all unpublished content.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="needs-translation">Yes, delete the user</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="needs-translation">Edit user "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="needs-translation">Home</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="needs-translation">Work</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="needs-translation">Package Management</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="needs-translation">The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="needs-translation">Available packages</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="needs-translation">Package Name</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="needs-translation">Package Key</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="needs-translation">Package Type</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="needs-translation">Deactivated</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="needs-translation">This package is currently frozen. Click to unfreeze it.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="needs-translation">Freeze the package in order to speed up your website.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="needs-translation">This package is protected and cannot be deactivated.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="needs-translation">Deactivate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="needs-translation">Activate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="needs-translation">This package is protected and cannot be deleted.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="needs-translation">Delete Package</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="needs-translation">Do you really want to delete "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="needs-translation">Yes, delete the package</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="needs-translation">Yes, delete the packages</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="needs-translation">Do you really want to delete the selected packages?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="needs-translation">Freeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="needs-translation">Unfreeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="needs-translation">Delete selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="needs-translation">Deactivate selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="needs-translation">Activate selected packages</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="needs-translation">Sites Management</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="needs-translation">The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="needs-translation">Add new site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="needs-translation">Create site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="needs-translation">Create a new site</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="needs-translation">Root node name</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="needs-translation">Domains</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="needs-translation">Site</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Pangalan</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="needs-translation">Default asset collection</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="needs-translation">Site package</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="needs-translation">Delete this site</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="needs-translation">Deactivate site</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="needs-translation">Activate site</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="needs-translation">Yes, delete the site</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="needs-translation">Import a site</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="needs-translation">Select a site package</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="needs-translation">No site packages are available. Make sure you have an active site package.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="needs-translation">Create a blank site</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="needs-translation">Select a document nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="needs-translation">Site name</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="needs-translation">Create empty site</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="needs-translation">Create a new site package</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="needs-translation">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="needs-translation">No sites available</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The <em>Neos Kickstarter</em> package is not installed, install it to kickstart new sites.</source>
-        <target state="needs-translation">The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="needs-translation">New site</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="needs-translation">New domain</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="needs-translation">Edit domain</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="needs-translation">Domain data</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="needs-translation">e.g. www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="needs-translation">State</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="needs-translation">Create</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="needs-translation">Configuration</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="needs-translation">The Configuration module provides you with an overview of all configuration types.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="needs-translation">Dimensions</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="needs-translation">Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="needs-translation">Inter dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="needs-translation">Inter dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="needs-translation">The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
@@ -569,416 +553,396 @@ Primary fallbacks are marked blue and always visible, while lower priority fallb
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="needs-translation">Intra dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="needs-translation">Intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="needs-translation">The intra dimensional fallback graph displays fallbacks within each content dimension.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="needs-translation">User</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="needs-translation">User Settings</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="needs-translation">This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Edit</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Edit</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="needs-translation">New electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="needs-translation">Edit account</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="needs-translation">Personal Data</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="needs-translation">User Data</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="needs-translation">User Menu</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="needs-translation">User Preferences</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="needs-translation">Interface Language</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="needs-translation">Use system default</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="needs-translation">Accounts</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Username</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="needs-translation">Authentication Provider</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="needs-translation">Electronic addresses</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="translated">Gusto mo ba talagang burahin itong buwis</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="needs-translation">Yes, delete electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="needs-translation">Click to add a new Electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="needs-translation">Add electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="needs-translation">Save User</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="needs-translation">Edit User</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">I-update</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="needs-translation">Edit User</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/tr/Modules.xlf b/Neos.Neos/Resources/Private/Translations/tr/Modules.xlf
index 66a4afec0c9..0a56ed1b982 100644
--- a/Neos.Neos/Resources/Private/Translations/tr/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/tr/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="tr">
     <body>
       <trans-unit id="back" xml:space="preserve">
-				<source>Back</source>
+        <source>Back</source>
         <target state="translated">Geri</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">İptal et</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="translated">Yönetim</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="translated">İçeriğin yönetimi ile ilgili birçok modül içerir</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="translated">Yönetim</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="translated">Yönetimle ilgili birden fazla modül içerir</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="translated">Kullanıcı Yönetimi</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="translated">Kullanıcı Yönetimi modülü, tüm arka uç kullanıcılarına genel bir bakış sağlar. Bunları özelliklerine göre gruplayabilirsiniz, böylece izinlerini, dosya bağlantılarını, üye gruplarını vb. izleyebilirsiniz. Bu modül, kullanıcıların doğru şekilde yapılandırıldığından emin olmak için vazgeçilmez bir araçtır.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="translated">Genel bakış</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="translated">Göster</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="translated">Yeni</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Düzenle</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Hesabı düzenle</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Yeni elektronik adresi</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Sistem varsayılanı kullan</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Kullanıcı oluştur</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="translated">Yeni bir kullanıcı oluştur</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Kullanıcı Verisi</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Kullanıcı adı</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">Şifre</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Şifreyi tekrar girin</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="translated">Rol(ler)</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">Kimlik Doğrulama Sağlayıcısı</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Sistem varsayılanı kullan</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Kişisel Verisi</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Ad</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Soyad</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">Kullanıcı Tercihleri</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">Arayüz Dili</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Kullanıcı oluştur</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="translated">Kullanıcı için ayrıntılar</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Kişisel Verisi</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">Başlık</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Ad</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="translated">İkinci Ad</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Soyad</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="translated">Diğer Ad</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Hesaplar</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Kullanıcı adı</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Roller</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="translated">Elektronik Adresleri</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="translated">Birincil</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="translated">Bilinmiyor</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="translated">Kullanıcıyı Sil</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Kullanıcıyı Düzenle</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">Bu kullanıcı olarak oturum açtınız ve kendiniz silemezsiniz.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="translated">Bu kullanıcıyı silmek için buraya tıklayın</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">"{0}" kullanıcısını gerçekten silmek istiyor musunuz?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">Evet, kullanıcıyı sil</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">Bu, yayımlanmamış tüm içerik de dahil olmak üzere kullanıcıyı, ilgili hesapları ve kişisel çalışma alanını silecek.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="translated">Bu işlem geri alınamaz</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="translated">"{accountIdentifier}" hesabını düzenle</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="translated">Hesap</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Kullanıcı adı</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="translated">Kullanıcı adı kullanıcı arabirimi aracılığıyla değiştirilemez</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="translated">Hesabı kaydet</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Şifreyi tekrar girin</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Roller</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Ad</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="translated">Hesaplar ve Roller</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="translated">Kullanıcıyı gör</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="translated">Kullanıcıyı düzenle</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="translated">Bu kullanıcıyı düzenlemek için yeterli yetki yok</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="translated">Bu kullanıcıyı silmek için yeterli yetki yok</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="translated">Kullanıcıyı sil</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">Bu kullanıcı olarak oturum açtınız ve kendiniz silemezsiniz.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">"{0}" kullanıcısını gerçekten silmek istiyor musunuz?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">Bu, yayımlanmamış tüm içerik de dahil olmak üzere kullanıcıyı, ilgili hesapları ve kişisel çalışma alanını silecek.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">Evet, kullanıcıyı sil</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="translated">"{0}" kullanıcısını düzenle</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="translated">Ana</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="translated">İş</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="translated">Paket Yönetimi</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="translated">Paket Yönetimi modülü, tüm paketlere genel bir bakış sağlar. Tek tek paketleri etkinleştirebilir ve devre dışı bırakabilir, yeni paketleri içe aktarabilir ve mevcut paketleri silebilirsiniz. Ayrıca geliştirme bağlamında paketleri dondurma ve çözme yeteneği de sağlar.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="translated">Mevcut paketler</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="translated">Paket Adı</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="translated">Paket Anahtarı</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="translated">Paket Türü</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="translated">Devre dışı bırakıldı</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="translated">Bu paket şu anda donmuş durumda. Etkinleştirmek için tıklayın.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="translated">Web sitenizi hızlandırmak için paketi dondurun.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="translated">Bu paket korumada ve devre dışı bırakılamaz.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="translated">Paketi Devre Dışı Bırak </target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="translated">Paketi Etkinleştir</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="translated">Bu paket korundu ve silinemiyor.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="translated">Paketi Sil</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="translated">"{0}" gerçekten silmek istiyor musunuz?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="translated">Evet, paketi sil</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="translated">Evet, paketleri sil</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="translated">Seçilen paketleri gerçekten silmek istiyor musunuz?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="translated">Seçilen paketleri dondur</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="translated">Seçili paketleri etkinleştir</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="translated">Seçilen paketleri sil</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="translated">Seçilen paketleri devre dışı bırak</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="translated">Seçilen paketleri etkinleştir</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="translated">Siteler Yönetimi</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="translated">Siteler Yönetimi modülü, tüm sitelere genel bir bakış sağlar. Siteleriniz hakkında yeni bir etki alanı ekleme gibi bilgileri düzenleyebilir, ekleyebilir ve silebilirsiniz.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="translated">Yeni bir site ekle</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="translated">Site oluştur</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="translated">Yeni bir site oluştur</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="translated">Kök düğüm adı</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="translated">Alan adları</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="translated">Site</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Ad</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="translated">Varsayılan varlık koleksiyonu</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="translated">Site paketi</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="translated">Bu siteyi sil</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="translated">Siteyi devre dışı bırak</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="translated">Siteyi aktif hale getir</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Bu {0} gönderiyi gerçekten kaldırmak istiyor musun? Bu eylem geri alınamaz.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="translated">Evet, siteyi sil</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="translated">Bir siteyi içe aktar</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="translated">Bir site paketi seçin</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="translated">Mevcut site paketi yok. Aktif bir site paketiniz olduğundan emin olun.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="translated">Boş bir site oluştur</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="translated">Bir döküman seçin</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="translated">Bir site oluşturucu seçin</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="translated">Site adı</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="translated">Boş bir site oluştur</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="translated">Yeni bir site paketi oluştur</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="translated">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="translated">Site yok</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-        <target state="translated">&lt;em&gt;Neos Kickstarter&lt;/em&gt;paketi yüklenmedi, başlatmak için yeni siteleri yükleyin.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="translated">Yeni site</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">Bu {0} gönderiyi gerçekten kaldırmak istiyor musun? Bu eylem geri alınamaz.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="translated">Yeni alan adı</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="translated">Alan adını düzenle</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="translated">Domain datası</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="translated">örneğin www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="translated">Devlet</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="translated">Oluştur</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="translated">Yapılandırma</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="translated">Yapılandırma modülü, tüm yapılandırma türlerine genel bir bakış sağlar.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="translated">Boyutlar</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="translated">Her içerik boyutu ve içerik boyutları arasında yapılandırılan geri dönüşleri üzerinde grafiksel bir genel bakış verir.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="translated">Boyutlararası düşüş grafiği</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="translated">Boyutlararası</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="translated">Boyutlararası geri dönüş grafiği, alt grafikler (düğüm olarak görüntülenen içerik boyutu değeri kombinasyonları) arasında olası tüm geri dönüşleri (kenar olarak görüntülenir) görüntüler.
@@ -569,416 +553,396 @@ Birincil yedekler mavi olarak işaretlenir ve her zaman görünür olurken, daha
 Yalnızca geri dönüşünü ve değişkenlerini görmek için düğümlerden birini tıklayın. Filtreyi kaldırmak için tekrar tıklayın.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="translated">Boyutlararası düşüş grafiği</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="translated">Boyutlararası</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="translated">İç boyutsal geri dönüşüm grafiği her içerik boyutu içinde geri düşümü görüntüler.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="translated">Kullanıcı</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="translated">Kullanıcı Ayarları</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="translated">Bu modül, arka uç kullanıcı profilinizi özelleştirmenize olanak tanır. Burada aktif sistem dilinizi, adınızı ve e-posta adresinizi değiştirebilirsiniz. Ayrıca sistemdeki diğer genel özellikleri de yapılandırabilirsiniz.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Düzenle</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Düzenle</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Yeni elektronik adresi</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Hesabı düzenle</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Kişisel Verisi</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Kullanıcı Verisi</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="translated">Kullanıcı Menüsü</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">Kullanıcı Tercihleri</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">Arayüz Dili</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Sistem varsayılanı kullan</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Hesaplar</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Kullanıcı adı</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Roller</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">Kimlik Doğrulama Sağlayıcısı</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="translated">Elektronik adresleri</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="translated">Gerçekten silmek istiyor musunuz</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="translated">Evet, elektronik adresini sil</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="translated">Yeni bir Elektronik adresi eklemek için tıklayın</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="translated">Elektronik adresi ekle</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="translated">Kullanıcıyı Kaydet</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Kullanıcıyı Düzenle</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">Güncelle</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Kullanıcıyı Düzenle</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/uk/Modules.xlf b/Neos.Neos/Resources/Private/Translations/uk/Modules.xlf
index 5f1ae641cc2..ee98b848842 100644
--- a/Neos.Neos/Resources/Private/Translations/uk/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/uk/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="uk">
     <body>
       <trans-unit id="back" xml:space="preserve">
-				<source>Back</source>
+        <source>Back</source>
         <target state="translated">Назад</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">Відмінити</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="translated">Керування</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="translated">Містить кілька модулів, які пов'язані з управлінням вмістом</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="translated">Адміністрування</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="translated">Містить кілька модулів, які пов'язані з адміністрацією</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="translated">Керування користувачами</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="translated">Модуль керування користувача надає огляд всіх користувачів бекенда. Їх можна згрупувати за властивостями та контролювати їх дозволи. Цей модуль є незамінним інструментом для правильної настройки користувачів.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="translated">Огляд</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="translated">Показати</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="translated">Новий</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Редагувати</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Редагувати обліковий запис</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Нова електронна адреса</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Налаштування за замовчуванням</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Створити користувача</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="translated">Створити нового користувача</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Дані Користувача</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Ім'я користувача</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">Пароль</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Повторіть пароль</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="translated">Ролі</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">Провайдер аутентифікації</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Налаштування за замовчуванням</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Персональні дані</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Ім'я</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Прізвище</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">Налаштування користувача</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">Мова інтерфейсу</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Створити користувача</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="translated">Реквізити для користувача</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Персональні дані</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">Назва</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Ім'я</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="translated">По батькові</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Прізвище</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="translated">Інші назви</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Облікові записи</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Ім'я користувача</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Ролі</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="translated">Електронні адреси</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="translated">Первинний</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="translated">Н/д</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="translated">Видалити користувача</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Редагувати користувача</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">Ви увійшли як користувач, і не можете видалити себе.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="translated">Натисніть тут, щоб видалити користувача</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">Ви дійсно хочете видалити користувача "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">Так, видаліть користувача</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">Користувач, пов'язані облікові записи і його особисті робочі середовища, з усіма неопублікованими записами буде видалено.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="translated">Цю операцію неможливо відмінити</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="translated">Змінити обліковий запис "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="translated">Обліковий запис</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Ім'я користувача</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="translated">Ім'я користувача не можна змінити за допомогою інтерфейсу користувача</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="translated">Зберегти профіль</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">Повторіть пароль</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Ролі</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Ім'я</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="translated">Облікові записи та ролі</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="translated">Переглянути користувача</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="translated">Редагувати користувача</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="translated">Видалити користувача</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">Ви увійшли як користувач, і не можете видалити себе.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">Ви дійсно хочете видалити користувача "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">Користувач, пов'язані облікові записи і його особисті робочі середовища, з усіма неопублікованими записами буде видалено.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">Так, видаліть користувача</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="translated">Редагувати користувача "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="translated">Головна</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="translated">Робота</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="translated">Система керування пакунками</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="translated">Модуль керування пакунками надає огляд всіх пакунків. Можна активувати та деактивувати окремі пакети, імпортувати нові пакети та видалювати існуючи пакунки. Вона також надає вам можливість заморозити і знову активувати пакунки у контексті розробки сайта.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="translated">Доступні пакети</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="translated">Ім'я пакету</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="translated">Ключ пакету</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="translated">Тип пакету</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="translated">Деактивовано</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="translated">Цей пакет зараз не діє. Натисніть щоб задіяти.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="translated">Зупинити дію пакету щоб підвищити швидкість вашого веб-сайту.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="translated">Цей пакет захищений і не може бути вимкнений.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="translated">Вимкнути пакет</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="translated">Увімкнути пакет</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="translated">Цей пакет захищений і не може бути видалений.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="translated">Видалити пакет</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="translated">Ви дійсно бажаєте видалити "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="translated">Так, видатити цей пакет</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="translated">Так, видатити ці пакети</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="translated">Ви дійсно бажаєте видалити вибрані пакети?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="translated">Зупинити дію обраних пакетів</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="translated">Задіяти обрані пакети</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="translated">Видалити обрані пакети</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="translated">Вимкнути обрані пакети</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="translated">Увімкнути обрані пакети</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="translated">Керування сайтами</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="translated">Модуль управління сайтів надає огляд всіх сайтів. Можна редагувати, додавати і видаляти інформацію про ваші сайти, такі як додавання нового домену.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="needs-translation">Add new site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="translated">Створити сайт</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="translated">Створити новий сайт</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="needs-translation">Root node name</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="translated">Домени</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="translated">Сайт</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Ім'я</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="needs-translation">Default asset collection</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="needs-translation">Site package</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="needs-translation">Delete this site</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="needs-translation">Deactivate site</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="needs-translation">Activate site</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="needs-translation">Yes, delete the site</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="needs-translation">Import a site</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="needs-translation">Select a site package</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="needs-translation">No site packages are available. Make sure you have an active site package.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="needs-translation">Create a blank site</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="needs-translation">Select a document nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="needs-translation">Site name</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="needs-translation">Create empty site</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="needs-translation">Create a new site package</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="needs-translation">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="needs-translation">No sites available</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The <em>Neos Kickstarter</em> package is not installed, install it to kickstart new sites.</source>
-        <target state="needs-translation">The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="needs-translation">New site</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="needs-translation">New domain</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="needs-translation">Edit domain</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="needs-translation">Domain data</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="needs-translation">e.g. www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="needs-translation">State</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="needs-translation">Create</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="translated">конфігурація</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="translated">Модуль Налаштування надає огляд всіх типів конфігурації.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="needs-translation">Dimensions</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="needs-translation">Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="needs-translation">Inter dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="needs-translation">Inter dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="needs-translation">The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
@@ -569,416 +553,396 @@ Primary fallbacks are marked blue and always visible, while lower priority fallb
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="needs-translation">Intra dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="needs-translation">Intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="needs-translation">The intra dimensional fallback graph displays fallbacks within each content dimension.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="translated">Користувач</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="translated">Налаштування користувача</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="translated">Цей модуль дозволяє налаштувати ваш профіль користувача бекенда. Тут ви можете змінити вашу активну системну мову, ім'я та адресу електронної пошти, та інші загальні системні функції.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Редагувати</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Редагувати</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Нова електронна адреса</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Редагувати обліковий запис</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Персональні дані</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Дані Користувача</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="translated">Меню Користувача</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">Налаштування користувача</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">Мова інтерфейсу</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Налаштування за замовчуванням</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Облікові записи</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Ім'я користувача</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">Ролі</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">Провайдер аутентифікації</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="translated">Електронні адреси</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="needs-translation">Do you really want to delete</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="translated">Так, видалити електронні адреси</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="translated">Клацніть, щоб додати нову електронну адресу</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="translated">Додати електронну адресу</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="translated">Зберегти користувача</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Редагувати користувача</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">Оновлення</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Редагувати користувача</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/vi/Modules.xlf b/Neos.Neos/Resources/Private/Translations/vi/Modules.xlf
index 8b44c56fbc1..846fa9c6d84 100644
--- a/Neos.Neos/Resources/Private/Translations/vi/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/vi/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="vi">
     <body>
       <trans-unit id="back" xml:space="preserve">
-				<source>Back</source>
+        <source>Back</source>
         <target state="translated">Quay lại</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">Hủy bỏ</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="translated">Quản lý</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="needs-translation">Contains multiple modules related to management of content</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="translated">Quản trị</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="translated">Có nhiều mô-đun liên quan đến quản trị</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="translated">Quản lý người dùng</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="translated">mô-đun quản lý người dùng cung cấp cho bạn một tổng quan về tất cả các người dùng phụ trợ. Bạn có thể nhóm chúng bằng tài sản của họ, do đó, bạn có thể theo dõi các quyền của mình, filemounts, thành viên nhóm v.v... Mô-đun này là một công cụ không thể thiếu để đảm bảo rằng những người sử dụng được cấu hình đúng.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="translated">Tổng quan</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="translated">Hiển thị</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="translated">Mới</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Chỉnh sửa</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Chỉnh sửa tài khoản</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Địa chỉ điện tử mới</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Sử dụng hệ thống mặc định </target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Tạo người dùng</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="translated">Tạo người dùng mới</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Dữ liệu người dùng</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Tên truy cập</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">Mật khẩu</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="needs-translation">Repeat password</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="translated">Role(s)</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="needs-translation">Authentication Provider</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Sử dụng hệ thống mặc định </target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Dữ liệu cá nhân</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Họ</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Tên</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="needs-translation">User Preferences</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="needs-translation">Interface Language</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">Tạo người dùng</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="translated">Thông tin chi tiết cho người dùng</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Dữ liệu cá nhân</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">Tiêu đề</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">Họ</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="translated">Họ đệm</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">Tên</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="translated">Tên khác</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Tài khoản</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Tên truy cập</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="translated">Địa chỉ điện tử</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="translated">Khóa chính</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="translated">N/A</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="translated">Xóa người dùng</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Chỉnh sửa người dùng</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="needs-translation">You are logged in as this user and you cannot delete yourself.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="needs-translation">Click here to delete this user</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="needs-translation">Do you really want to delete the user "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="needs-translation">Yes, delete the user</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="needs-translation">This will delete the user, the related accounts and his personal workspace, including all unpublished content.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="needs-translation">This operation cannot be undone</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="needs-translation">Edit account "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="needs-translation">Account</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Tên truy cập</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="needs-translation">The username can't be changed via the user interface</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="needs-translation">Save account</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="needs-translation">Repeat password</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Tên</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="needs-translation">Accounts and Roles</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="needs-translation">View user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="needs-translation">Edit user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="needs-translation">Delete user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="needs-translation">You are logged in as this user and you cannot delete yourself.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="needs-translation">Do you really want to delete the user "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="needs-translation">This will delete the user, the related accounts and his personal workspace, including all unpublished content.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="needs-translation">Yes, delete the user</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="needs-translation">Edit user "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="needs-translation">Home</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="needs-translation">Work</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="needs-translation">Package Management</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="needs-translation">The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="needs-translation">Available packages</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="needs-translation">Package Name</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="needs-translation">Package Key</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="needs-translation">Package Type</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="needs-translation">Deactivated</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="needs-translation">This package is currently frozen. Click to unfreeze it.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="needs-translation">Freeze the package in order to speed up your website.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="needs-translation">This package is protected and cannot be deactivated.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="needs-translation">Deactivate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="needs-translation">Activate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="needs-translation">This package is protected and cannot be deleted.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="needs-translation">Delete Package</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="needs-translation">Do you really want to delete "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="needs-translation">Yes, delete the package</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="needs-translation">Yes, delete the packages</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="needs-translation">Do you really want to delete the selected packages?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="needs-translation">Freeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="needs-translation">Unfreeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="needs-translation">Delete selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="needs-translation">Deactivate selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="needs-translation">Activate selected packages</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="needs-translation">Sites Management</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="needs-translation">The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="needs-translation">Add new site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="translated">Tạo site</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="translated">Tạo site mới</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="needs-translation">Root node name</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="needs-translation">Domains</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="needs-translation">Site</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">Tên</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="needs-translation">Default asset collection</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="needs-translation">Site package</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="needs-translation">Delete this site</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="needs-translation">Deactivate site</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="needs-translation">Activate site</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="needs-translation">Yes, delete the site</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="needs-translation">Import a site</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="needs-translation">Select a site package</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="needs-translation">No site packages are available. Make sure you have an active site package.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="needs-translation">Create a blank site</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="needs-translation">Select a document nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="needs-translation">Site name</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="needs-translation">Create empty site</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="needs-translation">Create a new site package</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="needs-translation">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="needs-translation">No sites available</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The <em>Neos Kickstarter</em> package is not installed, install it to kickstart new sites.</source>
-        <target state="needs-translation">The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="needs-translation">New site</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="needs-translation">New domain</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="needs-translation">Edit domain</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="needs-translation">Domain data</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="needs-translation">e.g. www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="needs-translation">State</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="needs-translation">Create</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="translated">Cấu hình</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="needs-translation">The Configuration module provides you with an overview of all configuration types.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="translated">Kích thước</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="needs-translation">Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="needs-translation">Inter dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="needs-translation">Inter dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="needs-translation">The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
@@ -569,416 +553,396 @@ Primary fallbacks are marked blue and always visible, while lower priority fallb
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="needs-translation">Intra dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="needs-translation">Intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="needs-translation">The intra dimensional fallback graph displays fallbacks within each content dimension.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="translated">Người dùng</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="translated">Cài đặt người dùng</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="needs-translation">This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Chỉnh sửa</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">Chỉnh sửa</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">Địa chỉ điện tử mới</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">Chỉnh sửa tài khoản</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">Dữ liệu cá nhân</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">Dữ liệu người dùng</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="translated">Menu người dùng</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="needs-translation">User Preferences</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="needs-translation">Interface Language</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">Sử dụng hệ thống mặc định </target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">Tài khoản</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">Tên truy cập</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="needs-translation">Roles</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="needs-translation">Authentication Provider</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="needs-translation">Electronic addresses</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="needs-translation">Do you really want to delete</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="needs-translation">Yes, delete electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="needs-translation">Click to add a new Electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="needs-translation">Add electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="translated">Lưu người dùng</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Chỉnh sửa người dùng</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">Cập Nhật</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">Chỉnh sửa người dùng</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/zh/Modules.xlf b/Neos.Neos/Resources/Private/Translations/zh/Modules.xlf
index ead3defe3ef..5b88dc81197 100644
--- a/Neos.Neos/Resources/Private/Translations/zh/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/zh/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="zh-CN">
     <body>
       <trans-unit id="back" xml:space="preserve">
-				<source>Back</source>
+        <source>Back</source>
         <target state="translated">返回</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">取消</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="translated">管理</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="translated">包含多个与管理内容有关的模块</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="translated">管理界面</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="translated">包含多个与管理有关的模块</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="translated">用户管理</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="translated">用户管理模块为您提供了所有的后端用户的概览。所以你能够查看他们的权限，文件加载点，你可以通过它们的属性分组成员组等...... 本模块确保用户被正确配置，是不可或缺的工具。</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="translated">概览</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="translated">显示</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="translated">新建</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">编辑</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">编辑账户</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">新的电子地址</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">使用系统默认值</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">创建用户</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="translated">创建新用户</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">用户数据</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">用户名</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">密码</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">密码确认</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="translated">角色</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">身份验证提供程序</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">使用系统默认值</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">个人资料</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">名字</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">姓氏</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">用户首选项</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">界面语言</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">创建用户</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="translated">用户的详细信息</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">个人资料</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">标题</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">名字</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="translated">中间名</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">姓氏</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="translated">其他名字</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">帐户</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">用户名</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">角色</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="translated">电子地址</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="translated">主要</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="translated">N/A</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="translated">删除用户</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">编辑用户</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">作为此用户登录，您不能删除自己。</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="translated">单击此处可删除此用户</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">你真的想要删除的用户"{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">是的，删除用户</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">这将删除用户、 相关的帐户和他个人的工作区，包括所有未发布的内容。</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="translated">该操作无法撤消。</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="translated">编辑帐户"{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="translated">帐户</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">用户名</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="translated">用户名不能通过用户界面更改</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="translated">保存账户</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">密码确认</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">角色</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">姓名</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="translated">帐户和角色</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="needs-translation">View user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="needs-translation">Edit user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="needs-translation">Delete user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="translated">作为此用户登录，您不能删除自己。</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="translated">你真的想要删除的用户"{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="translated">这将删除用户、 相关的帐户和他个人的工作区，包括所有未发布的内容。</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">是的，删除用户</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="needs-translation">Edit user "{0}"</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="needs-translation">Home</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="translated">工作</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="translated">包管理</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="translated">软件包管理模块为您提供了所有软件包的概览。您可以激活和停用单个包、 导入新的软件包并删除现有的包。在开发中，它还为您提供的冻结和解冻包的能力。</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="needs-translation">Available packages</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="needs-translation">Package Name</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="needs-translation">Package Key</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="needs-translation">Package Type</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="needs-translation">Deactivated</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="needs-translation">This package is currently frozen. Click to unfreeze it.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="needs-translation">Freeze the package in order to speed up your website.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="needs-translation">This package is protected and cannot be deactivated.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="needs-translation">Deactivate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="needs-translation">Activate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="needs-translation">This package is protected and cannot be deleted.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="needs-translation">Delete Package</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="needs-translation">Do you really want to delete "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="needs-translation">Yes, delete the package</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="needs-translation">Yes, delete the packages</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="needs-translation">Do you really want to delete the selected packages?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="needs-translation">Freeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="needs-translation">Unfreeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="needs-translation">Delete selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="needs-translation">Deactivate selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="needs-translation">Activate selected packages</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="translated">网站管理</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="translated">站点管理模块为您提供了所有站点的概览。你可以编辑、 添加和删除信息关于您的站点，如添加新的域。</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="translated">添加新站点</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="translated">创建站点</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="translated">创建一个新的网站</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="needs-translation">Root node name</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="translated">领域</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="translated">站点</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">姓名</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="needs-translation">Default asset collection</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="needs-translation">Site package</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="needs-translation">Delete this site</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="needs-translation">Deactivate site</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="needs-translation">Activate site</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="translated">是，删除站点</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="needs-translation">Import a site</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="needs-translation">Select a site package</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="needs-translation">No site packages are available. Make sure you have an active site package.</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="needs-translation">Create a blank site</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="needs-translation">Select a document nodeType</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="needs-translation">Site name</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="needs-translation">Create empty site</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="needs-translation">Create a new site package</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="needs-translation">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="translated">无可用站点</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The <em>Neos Kickstarter</em> package is not installed, install it to kickstart new sites.</source>
-        <target state="needs-translation">The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="translated">新站点</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="needs-translation">Do you really want to delete "{0}"? This action cannot be undone.</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="needs-translation">New domain</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="needs-translation">Edit domain</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="translated">域名数据</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="translated">例如：www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="needs-translation">State</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="translated">创建</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="translated">配置</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="translated">配置模块为您提供了所有配置类型的概览。</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="translated">大小</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="needs-translation">Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="needs-translation">Inter dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="needs-translation">Inter dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="needs-translation">The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
@@ -569,416 +553,396 @@ Primary fallbacks are marked blue and always visible, while lower priority fallb
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="needs-translation">Intra dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="needs-translation">Intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="needs-translation">The intra dimensional fallback graph displays fallbacks within each content dimension.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="translated">用户</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="translated">用户设置</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="translated">这个模块允许您自定义您的后端用户配置文件。在这里你可以更改你主动系统语言、 名称和电子邮件地址。您也可以在系统中配置其他常规功能。</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">编辑</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">编辑</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">新的电子地址</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">编辑账户</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">个人资料</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">用户数据</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="needs-translation">User Menu</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">用户首选项</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">界面语言</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">使用系统默认值</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">帐户</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">用户名</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">角色</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">身份验证提供程序</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="translated">电子地址</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="translated">你真的想要删除吗</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="translated">是的删除电子地址</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="translated">单击此处可添加新的电子地址</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="translated">添加电子地址</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="translated">保存用户</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">编辑用户</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">更新</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">编辑用户</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>
diff --git a/Neos.Neos/Resources/Private/Translations/zh_TW/Modules.xlf b/Neos.Neos/Resources/Private/Translations/zh_TW/Modules.xlf
index 69e22d381e3..fedd520941a 100644
--- a/Neos.Neos/Resources/Private/Translations/zh_TW/Modules.xlf
+++ b/Neos.Neos/Resources/Private/Translations/zh_TW/Modules.xlf
@@ -3,565 +3,549 @@
   <file original="" product-name="Neos.Neos" source-language="en" datatype="plaintext" target-language="zh-TW">
     <body>
       <trans-unit id="back" xml:space="preserve">
-				<source>Back</source>
+        <source>Back</source>
         <target state="translated">返回</target>
       </trans-unit>
       <trans-unit id="cancel" xml:space="preserve">
-				<source>Cancel</source>
+        <source>Cancel</source>
         <target state="translated">取消</target>
       </trans-unit>
       <!-- Management -->
       <trans-unit id="management.label" xml:space="preserve">
-				<source>Management</source>
+        <source>Management</source>
         <target state="translated">管理</target>
       </trans-unit>
       <trans-unit id="management.description" xml:space="preserve">
-				<source>Contains multiple modules related to management of content</source>
+        <source>Contains multiple modules related to management of content</source>
         <target state="translated">包含多個模組相關的管理內容</target>
       </trans-unit>
       <!-- Administration -->
       <trans-unit id="administration.label" xml:space="preserve">
-				<source>Administration</source>
+        <source>Administration</source>
         <target state="needs-translation">Administration</target>
       </trans-unit>
       <trans-unit id="administration.description" xml:space="preserve">
-				<source>Contains multiple modules related to administration</source>
+        <source>Contains multiple modules related to administration</source>
         <target state="needs-translation">Contains multiple modules related to administration</target>
       </trans-unit>
       <trans-unit id="users.label" xml:space="preserve">
-				<source>User Management</source>
+        <source>User Management</source>
         <target state="needs-translation">User Management</target>
       </trans-unit>
       <trans-unit id="users.description" xml:space="preserve">
-				<source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
+        <source>The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</source>
         <target state="needs-translation">The User Management module provides you with an overview of all backend users. You can group them by their properties so you are able to monitor their permissions, filemounts, member groups etc.. This module is an indispensable tool in order to make sure the users are correctly configured.</target>
       </trans-unit>
       <trans-unit id="users.action.index" xml:space="preserve">
-				<source>Overview</source>
+        <source>Overview</source>
         <target state="translated">概要</target>
       </trans-unit>
       <trans-unit id="users.action.show" xml:space="preserve">
-				<source>Show</source>
+        <source>Show</source>
         <target state="translated">顯示</target>
       </trans-unit>
       <trans-unit id="users.action.new" xml:space="preserve">
-				<source>New</source>
+        <source>New</source>
         <target state="translated">新增</target>
       </trans-unit>
       <trans-unit id="users.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">編輯</target>
       </trans-unit>
       <trans-unit id="users.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">編輯帳戶</target>
       </trans-unit>
       <trans-unit id="users.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">新電子郵件</target>
       </trans-unit>
       <trans-unit id="user.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">使用系統預設值</target>
       </trans-unit>
       <trans-unit id="users.actions.new.label" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">建立使用者</target>
       </trans-unit>
       <trans-unit id="users.actions.new.title" xml:space="preserve">
-				<source>Create a new user</source>
+        <source>Create a new user</source>
         <target state="translated">建立新使用者</target>
       </trans-unit>
       <trans-unit id="users.new.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">使用者資料</target>
       </trans-unit>
       <trans-unit id="users.new.userData.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">使用者名稱</target>
       </trans-unit>
       <trans-unit id="users.new.userData.password" xml:space="preserve">
-				<source>Password</source>
+        <source>Password</source>
         <target state="translated">密碼</target>
       </trans-unit>
       <trans-unit id="users.new.userData.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">重複密碼</target>
       </trans-unit>
       <trans-unit id="users.new.userData.roles" xml:space="preserve">
-				<source>Role(s)</source>
+        <source>Role(s)</source>
         <target state="translated">角色</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">驗證提供者</target>
       </trans-unit>
       <trans-unit id="users.new.userData.authenticationProviderName.useDefault" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">使用系統預設值</target>
       </trans-unit>
       <trans-unit id="users.new.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">個人資料</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">名字</target>
       </trans-unit>
       <trans-unit id="users.new.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">姓氏</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">使用者偏好設定</target>
       </trans-unit>
       <trans-unit id="users.new.userPreferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">介面語系</target>
       </trans-unit>
       <trans-unit id="users.new.createButton" xml:space="preserve">
-				<source>Create user</source>
+        <source>Create user</source>
         <target state="translated">建立使用者</target>
       </trans-unit>
       <trans-unit id="users.show.subtitle" xml:space="preserve">
-				<source>Details for user</source>
+        <source>Details for user</source>
         <target state="translated">使用者詳細資料</target>
       </trans-unit>
       <trans-unit id="users.show.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">個人資料</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.title" xml:space="preserve">
-				<source>Title</source>
+        <source>Title</source>
         <target state="translated">標題</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.firstName" xml:space="preserve">
-				<source>First Name</source>
+        <source>First Name</source>
         <target state="translated">名字</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.middleName" xml:space="preserve">
-				<source>Middle Name</source>
+        <source>Middle Name</source>
         <target state="translated">中間名</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.lastName" xml:space="preserve">
-				<source>Last Name</source>
+        <source>Last Name</source>
         <target state="translated">姓氏</target>
       </trans-unit>
       <trans-unit id="users.show.personalData.otherName" xml:space="preserve">
-				<source>Other Name</source>
+        <source>Other Name</source>
         <target state="translated">其他名稱</target>
       </trans-unit>
       <trans-unit id="users.show.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">帳戶</target>
       </trans-unit>
       <trans-unit id="users.show.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">使用者名稱</target>
       </trans-unit>
       <trans-unit id="users.show.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">角色</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses" xml:space="preserve">
-				<source>Electronic Addresses</source>
+        <source>Electronic Addresses</source>
         <target state="translated">電子郵件</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.primary" xml:space="preserve">
-				<source>Primary</source>
+        <source>Primary</source>
         <target state="translated">主要的</target>
       </trans-unit>
       <trans-unit id="users.show.electronicAddresses.notAvailable" xml:space="preserve">
-				<source>N/A</source>
+        <source>N/A</source>
         <target state="translated">無</target>
       </trans-unit>
       <trans-unit id="users.show.deleteUser" xml:space="preserve">
-				<source>Delete User</source>
+        <source>Delete User</source>
         <target state="translated">刪除使用者</target>
       </trans-unit>
       <trans-unit id="users.show.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">編輯使用者</target>
       </trans-unit>
       <trans-unit id="users.show.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="needs-translation">You are logged in as this user and you cannot delete yourself.</target>
       </trans-unit>
       <trans-unit id="users.show.clickToDeleteUser" xml:space="preserve">
-				<source>Click here to delete this user</source>
+        <source>Click here to delete this user</source>
         <target state="needs-translation">Click here to delete this user</target>
       </trans-unit>
       <trans-unit id="users.show.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="needs-translation">Do you really want to delete the user "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteButton" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">是的，刪除使用者</target>
       </trans-unit>
       <trans-unit id="users.show.confirmDeleteWarning" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="needs-translation">This will delete the user, the related accounts and his personal workspace, including all unpublished content.</target>
       </trans-unit>
       <trans-unit id="users.show.operationCannotBeUndone" xml:space="preserve">
-				<source>This operation cannot be undone</source>
+        <source>This operation cannot be undone</source>
         <target state="needs-translation">This operation cannot be undone</target>
       </trans-unit>
       <trans-unit id="users.editAccount.title" xml:space="preserve">
-				<source>Edit account "{accountIdentifier}"</source>
+        <source>Edit account "{accountIdentifier}"</source>
         <target state="needs-translation">Edit account "{accountIdentifier}"</target>
       </trans-unit>
       <trans-unit id="users.account" xml:space="preserve">
-				<source>Account</source>
+        <source>Account</source>
         <target state="translated">帳戶</target>
       </trans-unit>
       <trans-unit id="users.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">使用者名稱</target>
       </trans-unit>
       <trans-unit id="users.usernameCannotBeChanged" xml:space="preserve">
-				<source>The username can't be changed via the user interface</source>
+        <source>The username can't be changed via the user interface</source>
         <target state="needs-translation">The username can't be changed via the user interface</target>
       </trans-unit>
       <trans-unit id="users.saveAccount" xml:space="preserve">
-				<source>Save account</source>
+        <source>Save account</source>
         <target state="translated">儲存帳戶</target>
       </trans-unit>
       <trans-unit id="users.repeatPassword" xml:space="preserve">
-				<source>Repeat password</source>
+        <source>Repeat password</source>
         <target state="translated">重複密碼</target>
       </trans-unit>
       <trans-unit id="users.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">角色</target>
       </trans-unit>
       <trans-unit id="users.roles.directlyAssignedPrivileges" xml:space="preserve">
-				<source>Directly assigned privilege</source>
+        <source>Directly assigned privilege</source>
         <target state="needs-translation">Directly assigned privilege</target>
       </trans-unit>
       <trans-unit id="users.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">名稱</target>
       </trans-unit>
       <trans-unit id="users.roles.fromParentRole" xml:space="preserve">
-				<source>From Parent Role "{role}"</source>
+        <source>From Parent Role "{role}"</source>
         <target state="needs-translation">From Parent Role "{role}"</target>
       </trans-unit>
       <trans-unit id="users.accountsAndRoles" xml:space="preserve">
-				<source>Accounts and Roles</source>
+        <source>Accounts and Roles</source>
         <target state="translated">帳戶與角色</target>
       </trans-unit>
       <trans-unit id="users.tooltip.view" xml:space="preserve">
-				<source>View user</source>
+        <source>View user</source>
         <target state="translated">檢視使用者</target>
       </trans-unit>
       <trans-unit id="users.tooltip.edit" xml:space="preserve">
-				<source>Edit user</source>
+        <source>Edit user</source>
         <target state="translated">編輯使用者</target>
       </trans-unit>
       <trans-unit id="users.tooltip.editDisallowed" xml:space="preserve">
-				<source>Not enough privileges to edit this user</source>
+        <source>Not enough privileges to edit this user</source>
         <target state="needs-translation">Not enough privileges to edit this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.deleteDisallowed" xml:space="preserve">
-				<source>Not enough privileges to delete this user</source>
+        <source>Not enough privileges to delete this user</source>
         <target state="needs-translation">Not enough privileges to delete this user</target>
       </trans-unit>
       <trans-unit id="users.tooltip.delete" xml:space="preserve">
-				<source>Delete user</source>
+        <source>Delete user</source>
         <target state="translated">刪除使用者</target>
       </trans-unit>
       <trans-unit id="users.tooltip.cannotDeleteYourself" xml:space="preserve">
-				<source>You are logged in as this user and you cannot delete yourself.</source>
+        <source>You are logged in as this user and you cannot delete yourself.</source>
         <target state="needs-translation">You are logged in as this user and you cannot delete yourself.</target>
       </trans-unit>
       <trans-unit id="users.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the user "{0}"?</source>
+        <source>Do you really want to delete the user "{0}"?</source>
         <target state="needs-translation">Do you really want to delete the user "{0}"?</target>
       </trans-unit>
       <trans-unit id="users.message.willBeDeleted" xml:space="preserve">
-				<source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
+        <source>This will delete the user, the related accounts and his personal workspace, including all unpublished content.</source>
         <target state="needs-translation">This will delete the user, the related accounts and his personal workspace, including all unpublished content.</target>
       </trans-unit>
       <trans-unit id="users.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the user</source>
+        <source>Yes, delete the user</source>
         <target state="translated">是的，刪除使用者</target>
       </trans-unit>
       <trans-unit id="users.editUser" xml:space="preserve">
-				<source>Edit user "{0}"</source>
+        <source>Edit user "{0}"</source>
         <target state="translated">編輯使用者「{0}」</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Home" xml:space="preserve">
-				<source>Home</source>
+        <source>Home</source>
         <target state="translated">首頁</target>
       </trans-unit>
       <trans-unit id="users.electronicAddress.usage.type.Work" xml:space="preserve">
-				<source>Work</source>
+        <source>Work</source>
         <target state="translated">工作</target>
       </trans-unit>
       <trans-unit id="packages.label" xml:space="preserve">
-				<source>Package Management</source>
+        <source>Package Management</source>
         <target state="translated">套件管理</target>
       </trans-unit>
       <trans-unit id="packages.description" xml:space="preserve">
-				<source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
+        <source>The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</source>
         <target state="needs-translation">The Package Management module provides you with an overview of all packages. You can activate and deactivate individual packages, import new packages and delete existing packages. It also provides you with the ability to freeze and unfreeze packages in development context.</target>
       </trans-unit>
       <trans-unit id="packages.index.legend" xml:space="preserve">
-				<source>Available packages</source>
+        <source>Available packages</source>
         <target state="translated">可用套件</target>
       </trans-unit>
       <trans-unit id="packages.name" xml:space="preserve">
-				<source>Package Name</source>
+        <source>Package Name</source>
         <target state="translated">套件名稱</target>
       </trans-unit>
       <trans-unit id="packages.key" xml:space="preserve">
-				<source>Package Key</source>
+        <source>Package Key</source>
         <target state="translated">套件金鑰</target>
       </trans-unit>
       <trans-unit id="packages.type" xml:space="preserve">
-				<source>Package Type</source>
+        <source>Package Type</source>
         <target state="translated">套件類型</target>
       </trans-unit>
       <trans-unit id="packages.deactivated" xml:space="preserve">
-				<source>Deactivated</source>
+        <source>Deactivated</source>
         <target state="translated">已停用</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.unfreeze" xml:space="preserve">
-				<source>This package is currently frozen. Click to unfreeze it.</source>
+        <source>This package is currently frozen. Click to unfreeze it.</source>
         <target state="needs-translation">This package is currently frozen. Click to unfreeze it.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.freeze" xml:space="preserve">
-				<source>Freeze the package in order to speed up your website.</source>
+        <source>Freeze the package in order to speed up your website.</source>
         <target state="needs-translation">Freeze the package in order to speed up your website.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDeactivate" xml:space="preserve">
-				<source>This package is protected and cannot be deactivated.</source>
+        <source>This package is protected and cannot be deactivated.</source>
         <target state="needs-translation">This package is protected and cannot be deactivated.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.deactivate" xml:space="preserve">
-				<source>Deactivate Package</source>
+        <source>Deactivate Package</source>
         <target state="needs-translation">Deactivate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.activate" xml:space="preserve">
-				<source>Activate Package</source>
+        <source>Activate Package</source>
         <target state="needs-translation">Activate Package</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.noDelete" xml:space="preserve">
-				<source>This package is protected and cannot be deleted.</source>
+        <source>This package is protected and cannot be deleted.</source>
         <target state="needs-translation">This package is protected and cannot be deleted.</target>
       </trans-unit>
       <trans-unit id="packages.tooltip.delete" xml:space="preserve">
-				<source>Delete Package</source>
+        <source>Delete Package</source>
         <target state="needs-translation">Delete Package</target>
       </trans-unit>
       <trans-unit id="packages.message.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete "{0}"?</source>
+        <source>Do you really want to delete "{0}"?</source>
         <target state="needs-translation">Do you really want to delete "{0}"?</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the package</source>
+        <source>Yes, delete the package</source>
         <target state="needs-translation">Yes, delete the package</target>
       </trans-unit>
       <trans-unit id="packages.message.confirmDeletes" xml:space="preserve">
-				<source>Yes, delete the packages</source>
+        <source>Yes, delete the packages</source>
         <target state="needs-translation">Yes, delete the packages</target>
       </trans-unit>
       <trans-unit id="packages.message.selected.reallyDelete" xml:space="preserve">
-				<source>Do you really want to delete the selected packages?</source>
+        <source>Do you really want to delete the selected packages?</source>
         <target state="needs-translation">Do you really want to delete the selected packages?</target>
       </trans-unit>
       <trans-unit id="packages.selected.freeze" xml:space="preserve">
-				<source>Freeze selected packages</source>
+        <source>Freeze selected packages</source>
         <target state="needs-translation">Freeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.unfreeze" xml:space="preserve">
-				<source>Unfreeze selected packages</source>
+        <source>Unfreeze selected packages</source>
         <target state="needs-translation">Unfreeze selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.delete" xml:space="preserve">
-				<source>Delete selected packages</source>
+        <source>Delete selected packages</source>
         <target state="needs-translation">Delete selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.deactivate" xml:space="preserve">
-				<source>Deactivate selected packages</source>
+        <source>Deactivate selected packages</source>
         <target state="needs-translation">Deactivate selected packages</target>
       </trans-unit>
       <trans-unit id="packages.selected.activate" xml:space="preserve">
-				<source>Activate selected packages</source>
+        <source>Activate selected packages</source>
         <target state="needs-translation">Activate selected packages</target>
       </trans-unit>
       <trans-unit id="sites.label" xml:space="preserve">
-				<source>Sites Management</source>
+        <source>Sites Management</source>
         <target state="needs-translation">Sites Management</target>
       </trans-unit>
       <trans-unit id="sites.description" xml:space="preserve">
-				<source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
+        <source>The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</source>
         <target state="needs-translation">The Sites Management module provides you with an overview of all sites. You can edit, add and delete information about your sites, such as adding a new domain.</target>
       </trans-unit>
       <trans-unit id="sites.add" xml:space="preserve">
-				<source>Add new site</source>
+        <source>Add new site</source>
         <target state="translated">新增網站</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.label" xml:space="preserve">
-				<source>Create site</source>
+        <source>Create site</source>
         <target state="translated">建立網站</target>
       </trans-unit>
       <trans-unit id="sites.actions.newSite.title" xml:space="preserve">
-				<source>Create a new site</source>
+        <source>Create a new site</source>
         <target state="translated">建立新網站</target>
       </trans-unit>
       <trans-unit id="sites.rootNodeName" xml:space="preserve">
-				<source>Root node name</source>
+        <source>Root node name</source>
         <target state="translated">根節點名稱</target>
       </trans-unit>
       <trans-unit id="sites.domains" xml:space="preserve">
-				<source>Domains</source>
+        <source>Domains</source>
         <target state="translated">網域名稱</target>
       </trans-unit>
       <trans-unit id="sites" xml:space="preserve">
-				<source>Site</source>
+        <source>Site</source>
         <target state="translated">網站</target>
       </trans-unit>
       <trans-unit id="site.name" xml:space="preserve">
-				<source>Name</source>
+        <source>Name</source>
         <target state="translated">名稱</target>
       </trans-unit>
       <trans-unit id="sites.defaultAssetCollection" xml:space="preserve">
-				<source>Default asset collection</source>
+        <source>Default asset collection</source>
         <target state="translated">預設素材集</target>
       </trans-unit>
       <trans-unit id="sites.sitePackage" xml:space="preserve">
-				<source>Site package</source>
+        <source>Site package</source>
         <target state="translated">網站套件</target>
       </trans-unit>
       <trans-unit id="sites.delete" xml:space="preserve">
-				<source>Delete this site</source>
+        <source>Delete this site</source>
         <target state="translated">刪除此網站</target>
       </trans-unit>
       <trans-unit id="sites.deactivate" xml:space="preserve">
-				<source>Deactivate site</source>
+        <source>Deactivate site</source>
         <target state="translated">停用網站</target>
       </trans-unit>
       <trans-unit id="sites.activate" xml:space="preserve">
-				<source>Activate site</source>
+        <source>Activate site</source>
         <target state="translated">啟動網站</target>
       </trans-unit>
       <trans-unit id="sites.confirmDeleteQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">你確定要刪除「{0}」嗎？這個動作無法被復原。</target>
       </trans-unit>
       <trans-unit id="sites.confirmDelete" xml:space="preserve">
-				<source>Yes, delete the site</source>
+        <source>Yes, delete the site</source>
         <target state="translated">是的，刪除此網站</target>
       </trans-unit>
       <trans-unit id="sites.import" xml:space="preserve">
-				<source>Import a site</source>
+        <source>Import a site</source>
         <target state="translated">匯入網站</target>
       </trans-unit>
       <trans-unit id="sites.select" xml:space="preserve">
-				<source>Select a site package</source>
+        <source>Select a site package</source>
         <target state="translated">選擇網站套件</target>
       </trans-unit>
       <trans-unit id="sites.noPackackeInfo" xml:space="preserve">
-				<source>No site packages are available. Make sure you have an active site package.</source>
+        <source>No site packages are available. Make sure you have an active site package.</source>
         <target state="translated">沒有可用的網站套件，請確認已經啟動網站套件。</target>
       </trans-unit>
       <trans-unit id="sites.createBlank" xml:space="preserve">
-				<source>Create a blank site</source>
+        <source>Create a blank site</source>
         <target state="translated">建立空白網站</target>
       </trans-unit>
       <trans-unit id="sites.documentType" xml:space="preserve">
-				<source>Select a document nodeType</source>
+        <source>Select a document nodeType</source>
         <target state="translated">選擇文件節點類型</target>
       </trans-unit>
-      <trans-unit id="sites.generatorClass" xml:space="preserve">
-	  		    <source>Select a site generator</source>
-        <target state="needs-translation">Select a site generator</target>
-      </trans-unit>
       <trans-unit id="sites.name" xml:space="preserve">
-				<source>Site name</source>
+        <source>Site name</source>
         <target state="translated">網站名稱</target>
       </trans-unit>
       <trans-unit id="sites.createNode" xml:space="preserve">
-				<source>Create empty site</source>
+        <source>Create empty site</source>
         <target state="translated">建立空的網站</target>
       </trans-unit>
-      <trans-unit id="sites.createPackage" xml:space="preserve">
-				<source>Create a new site package</source>
-        <target state="translated">建立新網站套件</target>
-      </trans-unit>
-      <trans-unit id="sites.validPackageKeyInfo" xml:space="preserve">
-				<source>VendorName.MyPackageKey</source>
-        <target state="translated">VendorName.MyPackageKey</target>
-      </trans-unit>
       <trans-unit id="sites.noSitesAvailable" xml:space="preserve">
-				<source>No sites available</source>
+        <source>No sites available</source>
         <target state="needs-translation">No sites available</target>
       </trans-unit>
-      <trans-unit id="sites.noNeosKickstarterInfo" xml:space="preserve">
-				<source>The &lt;em&gt;Neos Kickstarter&lt;/em&gt; package is not installed, install it to kickstart new sites.</source>
-        <target state="translated">未安裝&lt;em&gt;Neos Kickstarter&lt;/em&gt;套件，立即安裝開始一個新的網站。</target>
-      </trans-unit>
       <trans-unit id="sites.new" xml:space="preserve">
-				<source>New site</source>
+        <source>New site</source>
         <target state="needs-translation">New site</target>
       </trans-unit>
       <trans-unit id="domain.deleteConfirmQuestion" xml:space="preserve">
-				<source>Do you really want to delete "{0}"? This action cannot be undone.</source>
+        <source>Do you really want to delete "{0}"? This action cannot be undone.</source>
         <target state="translated">你確定要刪除「{0}」嗎？這個動作無法被復原。</target>
       </trans-unit>
       <trans-unit id="domain.new" xml:space="preserve">
-				<source>New domain</source>
+        <source>New domain</source>
         <target state="translated">新網域名稱</target>
       </trans-unit>
       <trans-unit id="domain.edit" xml:space="preserve">
-				<source>Edit domain</source>
+        <source>Edit domain</source>
         <target state="translated">編輯網域名稱</target>
       </trans-unit>
       <trans-unit id="domainform.domainData" xml:space="preserve">
-				<source>Domain data</source>
+        <source>Domain data</source>
         <target state="needs-translation">Domain data</target>
       </trans-unit>
       <trans-unit id="domainform.hostPlaceholder" xml:space="preserve">
-				<source>e.g. www.neos.io</source>
+        <source>e.g. www.neos.io</source>
         <target state="needs-translation">e.g. www.neos.io</target>
       </trans-unit>
       <trans-unit id="domainform.state" xml:space="preserve">
-				<source>State</source>
+        <source>State</source>
         <target state="needs-translation">State</target>
       </trans-unit>
       <trans-unit id="domainform.create" xml:space="preserve">
-				<source>Create</source>
+        <source>Create</source>
         <target state="needs-translation">Create</target>
       </trans-unit>
       <trans-unit id="configuration.label" xml:space="preserve">
-				<source>Configuration</source>
+        <source>Configuration</source>
         <target state="translated">設定</target>
       </trans-unit>
       <trans-unit id="configuration.description" xml:space="preserve">
-				<source>The Configuration module provides you with an overview of all configuration types.</source>
+        <source>The Configuration module provides you with an overview of all configuration types.</source>
         <target state="needs-translation">The Configuration module provides you with an overview of all configuration types.</target>
       </trans-unit>
       <trans-unit id="dimensions.label" xml:space="preserve">
-				<source>Dimensions</source>
+        <source>Dimensions</source>
         <target state="needs-translation">Dimensions</target>
       </trans-unit>
       <trans-unit id="dimensions.description" xml:space="preserve">
-				<source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
+        <source>Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</source>
         <target state="needs-translation">Grants a graphical overview over the configured fallbacks within each content dimension and across content dimensions.</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.legend" xml:space="preserve">
-				<source>Inter dimensional fallback graph</source>
+        <source>Inter dimensional fallback graph</source>
         <target state="needs-translation">Inter dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.short" xml:space="preserve">
-				<source>Inter dimensional</source>
+        <source>Inter dimensional</source>
         <target state="needs-translation">Inter dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.interDimension.description" xml:space="preserve">
-				<source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
+        <source>The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
 Primary fallbacks are marked blue and always visible, while lower priority fallbacks are shown on mouseover. The higher the priority the higher the opacity.
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</source>
         <target state="needs-translation">The inter dimensional fallback graph displays all possible fallbacks (displayed as edges) between subgraphs (content dimension value combinations, displayed as nodes).
@@ -569,416 +553,396 @@ Primary fallbacks are marked blue and always visible, while lower priority fallb
 Click on one of the nodes to only see its fallbacks and variants. Click again to remove the filter.</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.legend" xml:space="preserve">
-				<source>Intra dimensional fallback graph</source>
+        <source>Intra dimensional fallback graph</source>
         <target state="needs-translation">Intra dimensional fallback graph</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.short" xml:space="preserve">
-				<source>Intra dimensional</source>
+        <source>Intra dimensional</source>
         <target state="needs-translation">Intra dimensional</target>
       </trans-unit>
       <trans-unit id="dimensions.intraDimension.description" xml:space="preserve">
-				<source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
+        <source>The intra dimensional fallback graph displays fallbacks within each content dimension.</source>
         <target state="needs-translation">The intra dimensional fallback graph displays fallbacks within each content dimension.</target>
       </trans-unit>
       <!-- User -->
       <trans-unit id="user.label" xml:space="preserve">
-				<source>User</source>
+        <source>User</source>
         <target state="translated">使用者</target>
       </trans-unit>
       <trans-unit id="userSettings.label" xml:space="preserve">
-				<source>User Settings</source>
+        <source>User Settings</source>
         <target state="translated">使用者設定</target>
       </trans-unit>
       <trans-unit id="userSettings.description" xml:space="preserve">
-				<source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
+        <source>This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</source>
         <target state="needs-translation">This module allows you to customize your backend user profile. Here you can change your active system language, name and email address. You may also configure other general features in the system.</target>
       </trans-unit>
       <trans-unit id="userSettings.action.index" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">編輯</target>
       </trans-unit>
       <trans-unit id="userSettings.action.edit" xml:space="preserve">
-				<source>Edit</source>
+        <source>Edit</source>
         <target state="translated">編輯</target>
       </trans-unit>
       <trans-unit id="userSettings.action.newElectronicAddress" xml:space="preserve">
-				<source>New electronic address</source>
+        <source>New electronic address</source>
         <target state="translated">新電子郵件</target>
       </trans-unit>
       <trans-unit id="userSettings.action.editAccount" xml:space="preserve">
-				<source>Edit account</source>
+        <source>Edit account</source>
         <target state="translated">編輯帳戶</target>
       </trans-unit>
       <trans-unit id="userSettings.personalData" xml:space="preserve">
-				<source>Personal Data</source>
+        <source>Personal Data</source>
         <target state="translated">個人資料</target>
       </trans-unit>
       <trans-unit id="userSettings.userData" xml:space="preserve">
-				<source>User Data</source>
+        <source>User Data</source>
         <target state="translated">使用者資料</target>
       </trans-unit>
       <trans-unit id="userSettings.usermenu" xml:space="preserve">
-				<source>User Menu</source>
+        <source>User Menu</source>
         <target state="translated">使用者選單</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences" xml:space="preserve">
-				<source>User Preferences</source>
+        <source>User Preferences</source>
         <target state="translated">使用者偏好設定</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.interfaceLanguage" xml:space="preserve">
-				<source>Interface Language</source>
+        <source>Interface Language</source>
         <target state="translated">介面語系</target>
       </trans-unit>
       <trans-unit id="userSettings.preferences.useDefaultInterfaceLanguage" xml:space="preserve">
-				<source>Use system default</source>
+        <source>Use system default</source>
         <target state="translated">使用系統預設值</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts" xml:space="preserve">
-				<source>Accounts</source>
+        <source>Accounts</source>
         <target state="translated">帳戶</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.username" xml:space="preserve">
-				<source>Username</source>
+        <source>Username</source>
         <target state="translated">使用者名稱</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.roles" xml:space="preserve">
-				<source>Roles</source>
+        <source>Roles</source>
         <target state="translated">角色</target>
       </trans-unit>
       <trans-unit id="userSettings.accounts.authenticationProvider" xml:space="preserve">
-				<source>Authentication Provider</source>
+        <source>Authentication Provider</source>
         <target state="translated">驗證提供者</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses" xml:space="preserve">
-				<source>Electronic addresses</source>
+        <source>Electronic addresses</source>
         <target state="translated">電子郵件</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete" xml:space="preserve">
-				<source>Do you really want to delete</source>
+        <source>Do you really want to delete</source>
         <target state="translated">您確定想要刪除</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.buttonDelete.confirmation" xml:space="preserve">
-				<source>Yes, delete electronic address</source>
+        <source>Yes, delete electronic address</source>
         <target state="needs-translation">Yes, delete electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.clickAddElectronicAddress" xml:space="preserve">
-				<source>Click to add a new Electronic address</source>
+        <source>Click to add a new Electronic address</source>
         <target state="needs-translation">Click to add a new Electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddresses.addElectronicAddress" xml:space="preserve">
-				<source>Add electronic address</source>
+        <source>Add electronic address</source>
         <target state="needs-translation">Add electronic address</target>
       </trans-unit>
       <trans-unit id="userSettings.saveUser" xml:space="preserve">
-				<source>Save User</source>
+        <source>Save User</source>
         <target state="translated">儲存使用者</target>
       </trans-unit>
       <trans-unit id="userSettings.editUser" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">編輯使用者</target>
       </trans-unit>
       <trans-unit id="configuration.anErrorOccurredDuringValidationOfTheConfiguration.title" xml:space="preserve">
-				<source>An error occurred during validation of the configuration.</source>
+        <source>An error occurred during validation of the configuration.</source>
         <target state="needs-translation">An error occurred during validation of the configuration.</target>
       </trans-unit>
       <trans-unit id="configuration.configurationTypeNotFound.body" xml:space="preserve">
-				<source>Configuration type not found.</source>
+        <source>Configuration type not found.</source>
         <target state="needs-translation">Configuration type not found.</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.title" xml:space="preserve">
-				<source>Site package not found</source>
+        <source>Site package not found</source>
         <target state="needs-translation">Site package not found</target>
       </trans-unit>
       <trans-unit id="sites.sitePackageNotFound.body" xml:space="preserve">
-				<source>The site package with key "{0}" was not found.</source>
+        <source>The site package with key "{0}" was not found.</source>
         <target state="needs-translation">The site package with key "{0}" was not found.</target>
       </trans-unit>
       <trans-unit id="sites.update.title" xml:space="preserve">
-				<source>Update</source>
+        <source>Update</source>
         <target state="translated">更新</target>
       </trans-unit>
       <trans-unit id="sites.update.body" xml:space="preserve">
-				<source>The site "{0}" has been updated.</source>
+        <source>The site "{0}" has been updated.</source>
         <target state="needs-translation">The site "{0}" has been updated.</target>
       </trans-unit>
-      <trans-unit id="sites.missingPackage.title" xml:space="preserve">
-				<source>Missing Package</source>
-        <target state="needs-translation">Missing Package</target>
-      </trans-unit>
-      <trans-unit id="sites.missingPackage.body" xml:space="preserve">
-				<source>The package "{0}" is required to create new site packages.</source>
-        <target state="needs-translation">The package "{0}" is required to create new site packages.</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.title" xml:space="preserve">
-				<source>Invalid package key</source>
-        <target state="needs-translation">Invalid package key</target>
-      </trans-unit>
-      <trans-unit id="sites.invalidPackageKey.body" xml:space="preserve">
-				<source>Site Packages {0} was created.</source>
-        <target state="needs-translation">Site Packages {0} was created.</target>
-      </trans-unit>
-      <trans-unit id="sites.sitePackagesWasCreated.body" xml:space="preserve">
-				<source>The package key "{0}" already exists.</source>
-        <target state="needs-translation">The package key "{0}" already exists.</target>
-      </trans-unit>
       <trans-unit id="sites.theSiteHasBeenImported.body" xml:space="preserve">
-				<source>The site has been imported.</source>
+        <source>The site has been imported.</source>
         <target state="needs-translation">The site has been imported.</target>
       </trans-unit>
       <trans-unit id="sites.importError.title" xml:space="preserve">
-				<source>Import error</source>
+        <source>Import error</source>
         <target state="needs-translation">Import error</target>
       </trans-unit>
       <trans-unit id="sites.importError.body" xml:space="preserve">
-				<source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
+        <source>Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</source>
         <target state="needs-translation">Error: During the import of the "Sites.xml" from the package "{0}" an exception occurred: {1}</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.siteWithSiteNodeNameAlreadyExists.body" xml:space="preserve">
-				<source>Error: A site with siteNodeName "{0}" already exists</source>
+        <source>Error: A site with siteNodeName "{0}" already exists</source>
         <target state="needs-translation">Error: A site with siteNodeName "{0}" already exists</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotFound.body" xml:space="preserve">
-				<source>Error: The given node type "{0}" was not found</source>
+        <source>Error: The given node type "{0}" was not found</source>
         <target state="needs-translation">Error: The given node type "{0}" was not found</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.title" xml:space="preserve">
-				<source>Site creation error</source>
+        <source>Site creation error</source>
         <target state="needs-translation">Site creation error</target>
       </trans-unit>
       <trans-unit id="sites.siteCreationError.givenNodeTypeNotBasedOnSuperType.body" xml:space="preserve">
-				<source>Error: The given node type "%s" is not based on the superType "{0}"</source>
+        <source>Error: The given node type "%s" is not based on the superType "{0}"</source>
         <target state="needs-translation">Error: The given node type "%s" is not based on the superType "{0}"</target>
       </trans-unit>
       <trans-unit id="sites.successfullyCreatedSite.body" xml:space="preserve">
-				<source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
+        <source>Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</source>
         <target state="needs-translation">Successfully created site "{0}" with siteNode "{1}", type "{2}" and packageKey "{3}"</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.title" xml:space="preserve">
-				<source>Site deleted</source>
+        <source>Site deleted</source>
         <target state="needs-translation">Site deleted</target>
       </trans-unit>
       <trans-unit id="sites.siteDeleted.body" xml:space="preserve">
-				<source>The site "{0}" has been deleted.</source>
+        <source>The site "{0}" has been deleted.</source>
         <target state="needs-translation">The site "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.title" xml:space="preserve">
-				<source>Site activated</source>
+        <source>Site activated</source>
         <target state="needs-translation">Site activated</target>
       </trans-unit>
       <trans-unit id="sites.siteActivated.body" xml:space="preserve">
-				<source>The site "{0}" has been activated.</source>
+        <source>The site "{0}" has been activated.</source>
         <target state="needs-translation">The site "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.title" xml:space="preserve">
-				<source>Site deactivated</source>
+        <source>Site deactivated</source>
         <target state="needs-translation">Site deactivated</target>
       </trans-unit>
       <trans-unit id="sites.siteDeactivated.body" xml:space="preserve">
-				<source>The site "{0}" has been deactivated.</source>
+        <source>The site "{0}" has been deactivated.</source>
         <target state="needs-translation">The site "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.title" xml:space="preserve">
-				<source>Domain updated</source>
+        <source>Domain updated</source>
         <target state="needs-translation">Domain updated</target>
       </trans-unit>
       <trans-unit id="sites.domainUpdated.body" xml:space="preserve">
-				<source>The domain "{0}" has been updated.</source>
+        <source>The domain "{0}" has been updated.</source>
         <target state="needs-translation">The domain "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.title" xml:space="preserve">
-				<source>Domain created</source>
+        <source>Domain created</source>
         <target state="needs-translation">Domain created</target>
       </trans-unit>
       <trans-unit id="sites.domainCreated.body" xml:space="preserve">
-				<source>'The domain "{0}" has been created.'</source>
+        <source>'The domain "{0}" has been created.'</source>
         <target state="needs-translation">'The domain "{0}" has been created.'</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.title" xml:space="preserve">
-				<source>Domain deleted</source>
+        <source>Domain deleted</source>
         <target state="needs-translation">Domain deleted</target>
       </trans-unit>
       <trans-unit id="sites.domainDeleted.body" xml:space="preserve">
-				<source>The domain "{0}" has been deleted.</source>
+        <source>The domain "{0}" has been deleted.</source>
         <target state="needs-translation">The domain "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.title" xml:space="preserve">
-				<source>Domain activated</source>
+        <source>Domain activated</source>
         <target state="needs-translation">Domain activated</target>
       </trans-unit>
       <trans-unit id="sites.domainActivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been activated.</source>
+        <source>The domain "{0}" has been activated.</source>
         <target state="needs-translation">The domain "{0}" has been activated.</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.title" xml:space="preserve">
-				<source>Domain deactivated</source>
+        <source>Domain deactivated</source>
         <target state="needs-translation">Domain deactivated</target>
       </trans-unit>
       <trans-unit id="sites.domainDeactivated.body" xml:space="preserve">
-				<source>The domain "{0}" has been deactivated.</source>
+        <source>The domain "{0}" has been deactivated.</source>
         <target state="needs-translation">The domain "{0}" has been deactivated.</target>
       </trans-unit>
       <trans-unit id="users.userCreated.title" xml:space="preserve">
-				<source>User created</source>
+        <source>User created</source>
         <target state="needs-translation">User created</target>
       </trans-unit>
       <trans-unit id="users.userCreated.body" xml:space="preserve">
-				<source>The user "{0}" has been created.</source>
+        <source>The user "{0}" has been created.</source>
         <target state="needs-translation">The user "{0}" has been created.</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.title" xml:space="preserve">
-				<source>User creation denied</source>
+        <source>User creation denied</source>
         <target state="needs-translation">User creation denied</target>
       </trans-unit>
       <trans-unit id="users.userCreationDenied.body" xml:space="preserve">
-				<source>You are not allowed to create a user with roles "{0}".</source>
+        <source>You are not allowed to create a user with roles "{0}".</source>
         <target state="needs-translation">You are not allowed to create a user with roles "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userCreationError.title" xml:space="preserve">
-				<source>Unable to create user.</source>
+        <source>Unable to create user.</source>
         <target state="needs-translation">Unable to create user.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.editing.body" xml:space="preserve">
-				<source>Not allowed to edit the user "{0}".</source>
+        <source>Not allowed to edit the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="users.userUpdated.body" xml:space="preserve">
-				<source>The user "{0}" has been updated.</source>
+        <source>The user "{0}" has been updated.</source>
         <target state="needs-translation">The user "{0}" has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.title" xml:space="preserve">
-				<source>User editing denied</source>
+        <source>User editing denied</source>
         <target state="needs-translation">User editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEditingDenied.deletion.body" xml:space="preserve">
-				<source>Not allowed to delete the user "{0}".</source>
+        <source>Not allowed to delete the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.title" xml:space="preserve">
-				<source>Current user cannot be deleted</source>
+        <source>Current user cannot be deleted</source>
         <target state="needs-translation">Current user cannot be deleted</target>
       </trans-unit>
       <trans-unit id="users.currentUserCannotBeDeleted.body" xml:space="preserve">
-				<source>You cannot delete the currently logged in user</source>
+        <source>You cannot delete the currently logged in user</source>
         <target state="needs-translation">You cannot delete the currently logged in user</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.title" xml:space="preserve">
-				<source>User deleted</source>
+        <source>User deleted</source>
         <target state="needs-translation">User deleted</target>
       </trans-unit>
       <trans-unit id="users.userDeleted.body" xml:space="preserve">
-				<source>The user "{0}" has been deleted.</source>
+        <source>The user "{0}" has been deleted.</source>
         <target state="needs-translation">The user "{0}" has been deleted.</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.title" xml:space="preserve">
-				<source>User account editing denied</source>
+        <source>User account editing denied</source>
         <target state="needs-translation">User account editing denied</target>
       </trans-unit>
       <trans-unit id="users.userAccountEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to edit the account for the user "{0}".</source>
+        <source>Not allowed to edit the account for the user "{0}".</source>
         <target state="needs-translation">Not allowed to edit the account for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.title" xml:space="preserve">
-				<source>Don\'t lock yourself out</source>
+        <source>Don\'t lock yourself out</source>
         <target state="needs-translation">Don\'t lock yourself out</target>
       </trans-unit>
       <trans-unit id="users.doNotLockYourselfOut.body" xml:space="preserve">
-				<source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
+        <source>With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</source>
         <target state="needs-translation">With the selected roles the currently logged in user wouldn\'t have access to this module any longer. Please adjust the assigned roles!</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.title" xml:space="preserve">
-				<source>Account updated</source>
+        <source>Account updated</source>
         <target state="needs-translation">Account updated</target>
       </trans-unit>
       <trans-unit id="users.accountUpdated.body" xml:space="preserve">
-				<source>The account has been updated.</source>
+        <source>The account has been updated.</source>
         <target state="needs-translation">The account has been updated.</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.title" xml:space="preserve">
-				<source>User email editing denied</source>
+        <source>User email editing denied</source>
         <target state="needs-translation">User email editing denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailEditingDenied.body" xml:space="preserve">
-				<source>Not allowed to create an electronic address for the user "{0}".</source>
+        <source>Not allowed to create an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to create an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.title" xml:space="preserve">
-				<source>Electronic address added</source>
+        <source>Electronic address added</source>
         <target state="needs-translation">Electronic address added</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.title" xml:space="preserve">
-				<source>User email deletion denied</source>
+        <source>User email deletion denied</source>
         <target state="needs-translation">User email deletion denied</target>
       </trans-unit>
       <trans-unit id="users.userEmailDeletionDenied.body" xml:space="preserve">
-				<source>Not allowed to delete an electronic address for the user "{0}".</source>
+        <source>Not allowed to delete an electronic address for the user "{0}".</source>
         <target state="needs-translation">Not allowed to delete an electronic address for the user "{0}".</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="users.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.title" xml:space="preserve">
-				<source>User updated</source>
+        <source>User updated</source>
         <target state="needs-translation">User updated</target>
       </trans-unit>
       <trans-unit id="userSettings.UserUpdated.body" xml:space="preserve">
-				<source>Your user has been updated.</source>
+        <source>Your user has been updated.</source>
         <target state="needs-translation">Your user has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userAccount.passwordUpdateFailed.title" xml:space="preserve">
-				<source>Updating password failed</source>
+        <source>Updating password failed</source>
         <target state="needs-translation">Updating password failed</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.title" xml:space="preserve">
-				<source>Password updated</source>
+        <source>Password updated</source>
         <target state="needs-translation">Password updated</target>
       </trans-unit>
       <trans-unit id="userSettings.passwordUpdated.body" xml:space="preserve">
-				<source>The password has been updated.</source>
+        <source>The password has been updated.</source>
         <target state="needs-translation">The password has been updated.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.title" xml:space="preserve">
-				<source>Edit User</source>
+        <source>Edit User</source>
         <target state="translated">編輯使用者</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressAdded.body" xml:space="preserve">
-				<source>An electronic address "{0}" ({1}) has been added.</source>
+        <source>An electronic address "{0}" ({1}) has been added.</source>
         <target state="needs-translation">An electronic address "{0}" ({1}) has been added.</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.title" xml:space="preserve">
-				<source>Electronic address removed</source>
+        <source>Electronic address removed</source>
         <target state="needs-translation">Electronic address removed</target>
       </trans-unit>
       <trans-unit id="userSettings.electronicAddressRemoved.body" xml:space="preserve">
-				<source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
+        <source>The electronic address "{0}" ({1}) has been deleted for "{2}".</source>
         <target state="needs-translation">The electronic address "{0}" ({1}) has been deleted for "{2}".</target>
       </trans-unit>
     </body>

From f145afd6e170cfef8f3e3f5f0f4bc627d5ecb1a6 Mon Sep 17 00:00:00 2001
From: Jenkins <jenkins@neos.io>
Date: Fri, 14 Jun 2024 08:18:50 +0000
Subject: [PATCH 24/26] TASK: Update references [skip ci]

---
 Neos.Neos/Documentation/References/CommandReference.rst         | 2 +-
 Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst | 2 +-
 Neos.Neos/Documentation/References/ViewHelpers/Form.rst         | 2 +-
 Neos.Neos/Documentation/References/ViewHelpers/Media.rst        | 2 +-
 Neos.Neos/Documentation/References/ViewHelpers/Neos.rst         | 2 +-
 Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst   | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Neos.Neos/Documentation/References/CommandReference.rst b/Neos.Neos/Documentation/References/CommandReference.rst
index 6a2b61c619b..e1600944b31 100644
--- a/Neos.Neos/Documentation/References/CommandReference.rst
+++ b/Neos.Neos/Documentation/References/CommandReference.rst
@@ -19,7 +19,7 @@ commands that may be available, use::
 
   ./flow help
 
-The following reference was automatically generated from code on 2024-06-13
+The following reference was automatically generated from code on 2024-06-14
 
 
 .. _`Neos Command Reference: NEOS.FLOW`:
diff --git a/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst b/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst
index 9422cebb7fd..6949b0eccbe 100644
--- a/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst
+++ b/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst
@@ -3,7 +3,7 @@
 FluidAdaptor ViewHelper Reference
 #################################
 
-This reference was automatically generated from code on 2024-06-13
+This reference was automatically generated from code on 2024-06-14
 
 
 .. _`FluidAdaptor ViewHelper Reference: f:debug`:
diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Form.rst b/Neos.Neos/Documentation/References/ViewHelpers/Form.rst
index 54768bc013e..a462ff6be25 100644
--- a/Neos.Neos/Documentation/References/ViewHelpers/Form.rst
+++ b/Neos.Neos/Documentation/References/ViewHelpers/Form.rst
@@ -3,7 +3,7 @@
 Form ViewHelper Reference
 #########################
 
-This reference was automatically generated from code on 2024-06-13
+This reference was automatically generated from code on 2024-06-14
 
 
 .. _`Form ViewHelper Reference: neos.form:form`:
diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Media.rst b/Neos.Neos/Documentation/References/ViewHelpers/Media.rst
index 0f4965d8def..4b47b651cd9 100644
--- a/Neos.Neos/Documentation/References/ViewHelpers/Media.rst
+++ b/Neos.Neos/Documentation/References/ViewHelpers/Media.rst
@@ -3,7 +3,7 @@
 Media ViewHelper Reference
 ##########################
 
-This reference was automatically generated from code on 2024-06-13
+This reference was automatically generated from code on 2024-06-14
 
 
 .. _`Media ViewHelper Reference: neos.media:fileTypeIcon`:
diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst b/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst
index cf5ffd46929..6e4b2a522a5 100644
--- a/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst
+++ b/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst
@@ -3,7 +3,7 @@
 Neos ViewHelper Reference
 #########################
 
-This reference was automatically generated from code on 2024-06-13
+This reference was automatically generated from code on 2024-06-14
 
 
 .. _`Neos ViewHelper Reference: neos:backend.authenticationProviderLabel`:
diff --git a/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst b/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst
index 0d0f5c7fdde..1db6f4c10c6 100644
--- a/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst
+++ b/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst
@@ -3,7 +3,7 @@
 TYPO3 Fluid ViewHelper Reference
 ################################
 
-This reference was automatically generated from code on 2024-06-13
+This reference was automatically generated from code on 2024-06-14
 
 
 .. _`TYPO3 Fluid ViewHelper Reference: f:alias`:

From 331761d8f7d486a13773c0ee5483384244f3caaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anke=20H=C3=A4slich?= <anke@neos.io>
Date: Fri, 14 Jun 2024 10:22:18 +0200
Subject: [PATCH 25/26] !!! TASK: Remove siteName from site package kickstarter

---
 .../Command/KickstartCommandController.php    |  5 ++---
 .../Generator/AfxTemplateGenerator.php        | 19 ++++++-------------
 .../SitePackageGeneratorInterface.php         |  5 ++---
 .../Fixtures/BlankSitePackageGenerator.php    |  2 +-
 .../Fixtures/NamedSitePackageGenerator.php    |  2 +-
 5 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/Neos.SiteKickstarter/Classes/Command/KickstartCommandController.php b/Neos.SiteKickstarter/Classes/Command/KickstartCommandController.php
index 34113608867..9f31d1f4ab7 100755
--- a/Neos.SiteKickstarter/Classes/Command/KickstartCommandController.php
+++ b/Neos.SiteKickstarter/Classes/Command/KickstartCommandController.php
@@ -47,9 +47,8 @@ class KickstartCommandController extends CommandController
      * This command generates a new site package with basic Fusion
      *
      * @param string $packageKey The packageKey for your site
-     * @param string $siteName The siteName of your site
      */
-    public function siteCommand($packageKey, $siteName): void
+    public function siteCommand($packageKey): void
     {
         if (!$this->packageManager->isPackageKeyValid($packageKey)) {
             $this->outputLine('Package key "%s" is not valid. Only UpperCamelCase in the format "Vendor.PackageKey", please!', [$packageKey]);
@@ -83,7 +82,7 @@ public function siteCommand($packageKey, $siteName): void
 
         $generatorService = $this->objectManager->get($generatorClass);
 
-        $generatedFiles = $generatorService->generateSitePackage($packageKey, $siteName);
+        $generatedFiles = $generatorService->generateSitePackage($packageKey);
         $this->outputLine(implode(PHP_EOL, $generatedFiles));
     }
 }
diff --git a/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php b/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
index fc64a3f70b5..0efc8448ad3 100755
--- a/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
+++ b/Neos.SiteKickstarter/Classes/Generator/AfxTemplateGenerator.php
@@ -43,7 +43,6 @@ class AfxTemplateGenerator extends GeneratorService implements SitePackageGenera
      * Generate a site package and fill it with boilerplate data.
      *
      * @param string $packageKey
-     * @param string $siteName
      * @return list<string>
      * @throws \Neos\Flow\Composer\Exception\InvalidConfigurationException
      * @throws \Neos\Flow\Package\Exception
@@ -54,7 +53,7 @@ class AfxTemplateGenerator extends GeneratorService implements SitePackageGenera
      * @throws \Neos\FluidAdaptor\Core\Exception
      * @throws \Neos\Utility\Exception\FilesException
      */
-    public function generateSitePackage(string $packageKey, string $siteName) : array
+    public function generateSitePackage(string $packageKey) : array
     {
         $package = $this->packageManager->createPackage($packageKey, [
             'type' => 'neos-site',
@@ -67,7 +66,7 @@ public function generateSitePackage(string $packageKey, string $siteName) : arra
             throw new \RuntimeException('Expected to generate flow site package for "' . $packageKey . '" but got ' . get_class($package));
         }
 
-        $this->generateSitesFusionDirectory($package, $siteName);
+        $this->generateSitesFusionDirectory($package);
         $this->generateNodeTypesConfiguration($package);
         $this->generateAdditionalFolders($package);
 
@@ -77,17 +76,11 @@ public function generateSitePackage(string $packageKey, string $siteName) : arra
     /**
      * Render the whole directory of the fusion part
      */
-    protected function generateSitesFusionDirectory(FlowPackageInterface $package, string $siteName) : void
+    protected function generateSitesFusionDirectory(FlowPackageInterface $package) : void
     {
-        $packageKey = $package->getPackageKey();
-        $contextVariables = [];
-        $contextVariables['packageKey'] = $packageKey;
-        $contextVariables['siteName'] = $siteName;
-        $packageKeyDomainPart = $packageKey;
-        if ($lastPackagePartWithDot = strrchr($packageKey, '.')) {
-            $packageKeyDomainPart = substr($lastPackagePartWithDot, 1) ?: $packageKey;
-        }
-        $contextVariables['siteNodeName'] = $packageKeyDomainPart;
+        $contextVariables = [
+            'packageKey' => $package->getPackageKey(),
+        ];
 
         $fusionRecursiveDirectoryRenderer = new FusionRecursiveDirectoryRenderer();
         $fusionRecursiveDirectoryRenderer->renderDirectory(
diff --git a/Neos.SiteKickstarter/Classes/Generator/SitePackageGeneratorInterface.php b/Neos.SiteKickstarter/Classes/Generator/SitePackageGeneratorInterface.php
index f74c5f73f36..4beb32acc81 100755
--- a/Neos.SiteKickstarter/Classes/Generator/SitePackageGeneratorInterface.php
+++ b/Neos.SiteKickstarter/Classes/Generator/SitePackageGeneratorInterface.php
@@ -19,13 +19,12 @@ interface SitePackageGeneratorInterface
      * returns generated files as an array
      *
      * @param string $packageKey
-     * @param string $siteName
      * @return list<string>
      */
-    public function generateSitePackage(string $packageKey, string $siteName): array;
+    public function generateSitePackage(string $packageKey): array;
 
     /**
-     * returns the human readable name of the generator
+     * returns the human-readable name of the generator
      *
      * @return string
      */
diff --git a/Neos.SiteKickstarter/Tests/Unit/Service/Fixtures/BlankSitePackageGenerator.php b/Neos.SiteKickstarter/Tests/Unit/Service/Fixtures/BlankSitePackageGenerator.php
index 0d10f50a2a9..cfd5f9aa06a 100755
--- a/Neos.SiteKickstarter/Tests/Unit/Service/Fixtures/BlankSitePackageGenerator.php
+++ b/Neos.SiteKickstarter/Tests/Unit/Service/Fixtures/BlankSitePackageGenerator.php
@@ -21,7 +21,7 @@
  */
 class BlankSitePackageGenerator implements SitePackageGeneratorInterface
 {
-    public function generateSitePackage(string $packageKey, string $siteName): array
+    public function generateSitePackage(string $packageKey): array
     {
         // just a dummy
     }
diff --git a/Neos.SiteKickstarter/Tests/Unit/Service/Fixtures/NamedSitePackageGenerator.php b/Neos.SiteKickstarter/Tests/Unit/Service/Fixtures/NamedSitePackageGenerator.php
index 491f4ccca53..3afd902220a 100755
--- a/Neos.SiteKickstarter/Tests/Unit/Service/Fixtures/NamedSitePackageGenerator.php
+++ b/Neos.SiteKickstarter/Tests/Unit/Service/Fixtures/NamedSitePackageGenerator.php
@@ -16,7 +16,7 @@
 
 class NamedSitePackageGenerator implements SitePackageGeneratorInterface
 {
-    public function generateSitePackage(string $packageKey, string $siteName): array
+    public function generateSitePackage(string $packageKey): array
     {
         // just a dummy
     }

From 84b5b60a2b4a332dcd254cd553c82841b8e1c2ce Mon Sep 17 00:00:00 2001
From: Jenkins <jenkins@neos.io>
Date: Wed, 19 Jun 2024 14:56:21 +0000
Subject: [PATCH 26/26] TASK: Update references [skip ci]

---
 Neos.Neos/Documentation/References/CommandReference.rst     | 6 ++----
 .../Documentation/References/ViewHelpers/FluidAdaptor.rst   | 2 +-
 Neos.Neos/Documentation/References/ViewHelpers/Form.rst     | 2 +-
 Neos.Neos/Documentation/References/ViewHelpers/Media.rst    | 2 +-
 Neos.Neos/Documentation/References/ViewHelpers/Neos.rst     | 2 +-
 .../Documentation/References/ViewHelpers/TYPO3Fluid.rst     | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/Neos.Neos/Documentation/References/CommandReference.rst b/Neos.Neos/Documentation/References/CommandReference.rst
index e1600944b31..6f25fe71273 100644
--- a/Neos.Neos/Documentation/References/CommandReference.rst
+++ b/Neos.Neos/Documentation/References/CommandReference.rst
@@ -19,7 +19,7 @@ commands that may be available, use::
 
   ./flow help
 
-The following reference was automatically generated from code on 2024-06-14
+The following reference was automatically generated from code on 2024-06-19
 
 
 .. _`Neos Command Reference: NEOS.FLOW`:
@@ -2967,15 +2967,13 @@ Package *NEOS.SITEKICKSTARTER*
 
 **Kickstart a new site package**
 
-This command generates a new site package with basic Fusion and Sites.xml
+This command generates a new site package with basic Fusion
 
 Arguments
 ^^^^^^^^^
 
 ``--package-key``
   The packageKey for your site
-``--site-name``
-  The siteName of your site
 
 
 
diff --git a/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst b/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst
index 6949b0eccbe..228d3e9e9b6 100644
--- a/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst
+++ b/Neos.Neos/Documentation/References/ViewHelpers/FluidAdaptor.rst
@@ -3,7 +3,7 @@
 FluidAdaptor ViewHelper Reference
 #################################
 
-This reference was automatically generated from code on 2024-06-14
+This reference was automatically generated from code on 2024-06-19
 
 
 .. _`FluidAdaptor ViewHelper Reference: f:debug`:
diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Form.rst b/Neos.Neos/Documentation/References/ViewHelpers/Form.rst
index a462ff6be25..a1c528b274f 100644
--- a/Neos.Neos/Documentation/References/ViewHelpers/Form.rst
+++ b/Neos.Neos/Documentation/References/ViewHelpers/Form.rst
@@ -3,7 +3,7 @@
 Form ViewHelper Reference
 #########################
 
-This reference was automatically generated from code on 2024-06-14
+This reference was automatically generated from code on 2024-06-19
 
 
 .. _`Form ViewHelper Reference: neos.form:form`:
diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Media.rst b/Neos.Neos/Documentation/References/ViewHelpers/Media.rst
index 4b47b651cd9..f6072f6df6d 100644
--- a/Neos.Neos/Documentation/References/ViewHelpers/Media.rst
+++ b/Neos.Neos/Documentation/References/ViewHelpers/Media.rst
@@ -3,7 +3,7 @@
 Media ViewHelper Reference
 ##########################
 
-This reference was automatically generated from code on 2024-06-14
+This reference was automatically generated from code on 2024-06-19
 
 
 .. _`Media ViewHelper Reference: neos.media:fileTypeIcon`:
diff --git a/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst b/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst
index 6e4b2a522a5..a0114bb0efc 100644
--- a/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst
+++ b/Neos.Neos/Documentation/References/ViewHelpers/Neos.rst
@@ -3,7 +3,7 @@
 Neos ViewHelper Reference
 #########################
 
-This reference was automatically generated from code on 2024-06-14
+This reference was automatically generated from code on 2024-06-19
 
 
 .. _`Neos ViewHelper Reference: neos:backend.authenticationProviderLabel`:
diff --git a/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst b/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst
index 1db6f4c10c6..d14e217cea4 100644
--- a/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst
+++ b/Neos.Neos/Documentation/References/ViewHelpers/TYPO3Fluid.rst
@@ -3,7 +3,7 @@
 TYPO3 Fluid ViewHelper Reference
 ################################
 
-This reference was automatically generated from code on 2024-06-14
+This reference was automatically generated from code on 2024-06-19
 
 
 .. _`TYPO3 Fluid ViewHelper Reference: f:alias`: